merge from open-source master

Change-Id: Ica186e494a0a2693a5498639448c36d17bb2959f