Merge a61e06f96876259b424e6d96323e8c80adb8718b on remote branch

Change-Id: If4a24dec51f40c2592c2bfa112b6b7bd82595a02