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

Change-Id: Ibd712b8feab5af0a56a363ffd1855a32cde938a3