Merge 7451bff8066d9af7ef8e378d9f825ea1fea1a6f9 on remote branch

Change-Id: Ie3d74e98cc2946c856830e4beb72186a71a20177