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

Change-Id: Ia54463c93a7f941d7de3cc003ce773749d1f016e
1 file changed