DO NOT MERGE - Merge RQ1A.201205.011 am: 04480d28d1

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tremolo/+/13176821

Change-Id: I20785fd969b3395026fe1efc5bb79f285493d3fa