Merge 4eaefc20a9d39fb79f96cdb4a59d9afd7e1687ca on remote branch

Change-Id: I199c2bdcca4939ed27305ca1e6c693a4f6bab226