Merge "Update flicker logger on platinum tests and cleanup deprecated Bp files" into main