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

Change-Id: I2f0e25a416e3561d3eb99f66393ba5f86b5e21ac