Merge "Set proper sdk_version" am: 7926c61e43
am: f23c135dfe

Change-Id: Ied767cb1d5c935cf13b66045b51408b63a5c7ca1