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

Change-Id: Ifbbc7345a9e548c496f30b64d45ce2662c81ca16