Merge b479a551646e62a3d88e5acef0d904cafdacd241 on remote branch

Change-Id: I04f6b1963feb3dfc69597d9c03b16b5d01a8f6a2