Merge 7f8dd14271cc3b6a001ff1e2318decc2d42cb034 on remote branch

Change-Id: I7f47fb7e0040408eb793d0b1f0b807ad9a9c2f23