Merge 4e9fae1fae237c9b3e85b4b1ec553ffd0367f5ac on remote branch

Change-Id: I1f9b12d6640d4a33978645628f86f295439dde8f