Merge cc2fa7637e81300268ccf80e8bd6f25d4999df22 on remote branch

Change-Id: I4e4118c3a3211daf809496ceb71894aa4dc67462