Merge b49cbcdf019bd0990f3748d93e0fa01fbb53ed79 on remote branch

Change-Id: Ie0f04b1a5060351a53505bcb2523c3f7a3a2fc04