merge from open-source master

Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4