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

Change-Id: Ie0e87a1f89d207eeba12daccfa6cb4f1757195eb