Merge 2794b692e9fa1db1b135623ec8968ca4dedd8f55 on remote branch

Change-Id: I4601ec0508e353c4c0153936858f43aa4761e30f