Merge 42c94791 from open-source master

Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be