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

Change-Id: Ibdd1eef03d7087e66dc85d29773988cd9a3f9d3e