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

Change-Id: Iaab6795af8c98e1f5b85679c2e16c4af02059204