Merge 797a3c06a1b2fb4111be5e82d82dada820356fb7 on remote branch

Change-Id: Ieccfd14fcf6ca54fa8cfc128adf4ddc0f2b600ef