Merge 7195678284b689a7433a122b149956dbd4ee24f1 on remote branch

Change-Id: I61e97f3207ba17ef109c5ee18c977f83b0518d96