Merge 66e344586d6cdbea96f3dba363fa8e6efc5e1c42 on remote branch

Change-Id: I563aefb3c922b1954f24bf60db254c8ae2c9edb1