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

Change-Id: I05ef978d28a69419e8ffe2ca4c357de5900e4049