Merge cd706570c05ad3efaeae2a2b275d4ec9b7ba647f on remote branch

Change-Id: Ic98cf4ccf04e6fdea2cd1a473749452843572dbb