Merge 47f655150f7f4e066f27e8f122f6c0a6949d4caa on remote branch

Change-Id: Ifbd2c64103d9eef3d6ef82062a934918d927f3c2