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

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594