Merge b2114785bef7a7fdf3b15153440938dba63ba8a7 on remote branch

Change-Id: I6bcea15884c0228396e1cf181bdfd81be57055f3