Merge b19ffea8851b03e6ee9eaa58bad7f3d52a262ab3 on remote branch

Change-Id: Iff18dc2734ba978a19a548788a28dba638924dc9