Merge 495740890441c1ec16623e745f83da06bea3e2c5 on remote branch

Change-Id: Ie006885b5cd9774b13cfee8f0a510a36107b0d25