Merge corrections

Change-Id: I9b56d3a234967e4741905ebc0ad083fc0dfc6ad9
diff --git a/.idea/scopes/platform.xml b/.idea/scopes/platform.xml
new file mode 100644
index 0000000..a0bafd1
--- /dev/null
+++ b/.idea/scopes/platform.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="platform" pattern="src:*..*&amp;&amp;!src[group:Android]:*..*" />
+</component>
\ No newline at end of file