Merge "sdk_version: "module_current" is supported" am: c4930248c4

Change-Id: I76b818444db59cc50bae21e22475d2273490c122