merge from open-source master

Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b