merge from open-source master

Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e