Merge "hotspot2: add support for complete HomeSP subtree" am: 28c7afe578 am: 6570ce6c80
am: 704f1bfea4

Change-Id: I0ad0256eb12fd4c255dd0c27d7ec8b90d42ccbdc