Merge "Update from 7.55.1 to 7.57.0" am: 96660a18c5
am: 484d473385

Change-Id: I32e13d89b042b3e0f824bd2cc1f1da4b65140f0b