Synced to lmp-mr1-ub-docs commit 9b3abfde74ffa708734d2b8a09e1de0a0c82451c. Change-Id: Ibae1c4729c9b8b4c0de2faebb998459a8da524e1
Synced to developers/samples/android commit 54bab34b386e343e9d0ea75a5fb8d13db2c71eb5. Change-Id: I1c9d9d2c1f53a051d7b4d85303d5c01ab6f16e68