Merge "Fixed an issue where HUNS could have a background" into nyc-mr1-dev am: b43494a1 am: 1062dd6f am: a1dca848 Change-Id: I726737ed5657e4049003a8c4ced47ecee6306ffa