merge from open-source master

Change-Id: I6a15428fd9ce1f1dbbb702ff13c6af8da8f54a1e