Set proper sdk_version am: 4c4e677135
am: b0d0585095

Change-Id: If6499e976b4a93107cfe13edb804a95f0cfc7aae