merge from open-source master

Change-Id: I63e2bfcf87d190fb063c5b2457ebe6b0d50ddd26