Merge db4e4735e1051f09eceb1b7cc0428b0d0769aaa3 on remote branch

Change-Id: Ia8aae4488c056aafd53de0b5ba043a9e15bebc56