Merge 8839879b9d5fbb8b4f8c2242adad353e96fa7947 on remote branch

Change-Id: I0825cc886a1318f853842a2f0cf2752b8252026a