DO NOT MERGE: CTS to 201608s am: 0ae1254202  -s ours am: 3cf4c9926e
am: d42b0d223f  -s ours

Change-Id: Idf424ffe2f5d02cb2a3196f4e1914c41f836dceb