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

Change-Id: Ib52dc01c50cdbc10fe1b1d579bf72730e6223b19