Merge 849c09fe3017895d569d50925b9c573beda24553 on remote branch

Change-Id: I77372bfd0b37019493dc44e0494b89059a764e65