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