merge from open-source master

Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0