developers/samples/android commit: 6f3586bc08b96d14d8f1315f4839ac59aa39798c Change-Id: I08c9af2d58f1b3314eba807048dc05175a58e164
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508