merge from open-source master

Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df