Merge b59f7c029f9c700e73efbf4fafca521490eaac42 on remote branch

Change-Id: I1ba87140d63529a0360cc8d5ed92b4ecf72a0b64