Merge 45b44db1076ee77b33fb635bd4c22fcb43117ce4 on remote branch

Change-Id: I7800e3f69d3cc433a618d702577b690b34460bee