Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev am: bc6dc5c20c
am: 151d5600b1

Change-Id: I60106dd55184e0ad48a216a71ab066849636ddb2