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

Change-Id: I8c232cc7d246b28943d16c1f28121597dad8f215