am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the...
am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
* commit '7c08dd61':
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier