Synced to lmp-mr1-ub-docs commit 9b3abfde74ffa708734d2b8a09e1de0a0c82451c. Change-Id: Ibae1c4729c9b8b4c0de2faebb998459a8da524e1
Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b