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

Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e