Merge 78c87ff099e9dfec14fa5194a66b74cc144853b7 on remote branch

Change-Id: I5a00a5a710d577035214fdb0568a85c68744e6dc