Merge 3b048a4a3ff38849053bc73fb2d97183bc02c7d3 on remote branch

Change-Id: I554d4f6e95b283f989f966ed08c6e716f9471275