Merge 334bffd57e838707206b2ab8ca5a809d0248b485 on remote branch

Change-Id: Ie1ee50b17cf89abe53ca3e9d53ef7c224e4bc5c8