Merge 4c41b4e2c58f80743ecc4eb87e149882d58047c1 on remote branch

Change-Id: Idf2e799de15104a128e2615e89afd95a6ffc2159