Merge changes from topics "multiband", "ssc3" am: 39ddbb92a5 am: a4021bde11

Change-Id: I37af5fc8bb6ef0cd2b76858290779e5f51d71c4a