DO NOT MERGE ANYWHERE Import SDK from build 3336686 am: 063536db8e  -s ours
am: 51b13339c0  -s ours

Change-Id: Ica5d889810a6cfdec76879f4887ab6aea3fc644c