Merge "hotspot2: ignore uninterested headers and content type attributes" am: 7a7bb444cb
am: 10d1deff83

Change-Id: Id8850e9dce3a1c6ee7edfa7730ec8952efe9b3da