Merge 42a471bf192ddf5a97b724ee6550bfc78d583c41 on remote branch

Change-Id: I14e04daac751b28625238cb9902e1727338c7bef