Merge 04bff539a711ca4000f480d2783571c3ab0ade31 on remote branch

Change-Id: I92f454dfaec96e3d3c5738a7f9a3958c51d24c32