Merge 00179f357c5b957515cc65283c25119c76900f20 on remote branch

Change-Id: I7df304c4605271e28c27b263616a19709f2ade6e