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

Change-Id: I56ae04669ad7e4031cef84489c84cd7230464483