Merge bea935fd298a58b3a244dc4b61239364d812c198 on remote branch

Change-Id: If10a0457ffc6727cda851ea11210ec47233e73e4