Merge 7b619a8b11dfcf7811710f49af2028e6f5e184e1 on remote branch

Change-Id: I73edd64222c58cd8fd2130eb34a75ed3de4487eb