Synced to commits: - //developers/samples/android fc1c2eac13aa87531f030f8c65d7e27c301135af - //developers/build 18730e97 Change-Id: I1d16dd51f4e06476bb7590df68612556c828c912