am: cbde9109b6 * commit 'cbde9109b61beac47e93394f3e03b8fb52e8df97': Corrections to support HLS
cbde9109b6