Merge cae17bbc52f505b5d09b4dd36ce3e74b21e245a8 on remote branch

Change-Id: I4726b5f3360802a2f6a59242e21c7daa90120302