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

Change-Id: I2d02963e3ae2864b8037673402287d1d320d15f6