merge from open-source master

Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64