Merge changes from topic 'hide_passpoint_r2' into oc-dev am: 4bd47fce86
am: 421018f44b

Change-Id: I6d56c9c822e707ed41fc3a4b3c0ca58188bc1000