merge from open-source master

Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a