Merge "Fixed an issue where HUNS could have a background" into nyc-mr1-dev am: b43494a1dc am: 1062dd6fe9
am: a1dca8483a

Change-Id: I726737ed5657e4049003a8c4ced47ecee6306ffa