Merge 7b393fd1 from open-source master

Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26