am 408dba5f: Merge "HLS: fix live lock after missing the boat during...
am 408dba5f: Merge "HLS: fix live lock after missing the boat during configuration change" into lmp-mr1-dev
* commit '408dba5f':
HLS: fix live lock after missing the boat during configuration change