Merge 2c0a2a9d575ed708df356c13c9a8355abed48f6e on remote branch

Change-Id: I803275afa8f243b28c109a8d4c74b547b07c2ef8