Merge 1a879fc02494b4953a11647e8dab1b1c4399c109 on remote branch

Change-Id: I3cd230ec58f06a65f2ae3808baab8494990aad87