merge from open-source master

Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87