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

Change-Id: I823e0109eefff2541fe03987eadb293ba08b958c