Merge e1aa5131c8ab18c8c7dec2654b608b6ab0ce47d8 on remote branch

Change-Id: Ie7f819cf286113cf7f6f331865e16149c3ae81c0