Merge 173c887e40682d6d3db2ea627a41eb47e7ea3198 on remote branch

Change-Id: Ic1e1bd2824f456369421e7ef5b1c176b927e6def