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

Change-Id: I563d9f73ba68406d17dd553bb4547be78b056206