Merge e3bed8d0faaff3f29d6197e6e296db03eea716c0 on remote branch

Change-Id: Ic5547fcf9e79d56f318c5dcb124abb77f79c79b5