Merge from open-source master

Change-Id: Icc569e311600504c75304c79fa878614ac597fba