Merge 10cd7cd0d9f621e04d5b0cff5a3036ac759c0e93 on remote branch

Change-Id: Id68803f9a2559eb9f5455036e07ae95a56d143fd