do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch

Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2
1 file changed