DO NOT MERGE ANYWHERE Import SDK from build 3098787 am: e59b2ef0f9  -s ours
am: 6a7ae7ec17  -s ours

Change-Id: I14e615c804b2a3669dfe11ee4cb85ba8e8d5d52d