Merge 04385785f05c0fe78f8813cd6b0f0fd891ba3a4b on remote branch

Change-Id: I5a3945393e6216758d07e792765f28727ef6059f
tree: 0351742c3215b5446f896fa58311fed2acadc41d
  1. assets/
  2. icons/
  3. res/
  4. src/
  5. TestCommon/
  6. tests/
  7. AndroidManifest.xml
  8. build.gradle