Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bd am: 8c3f398c am: 209edee4 Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527