Merge "DO NOT MERGE Allow the USE_OPEN_WIFI_PACKAGE to access WifiInfo unfiltered." into oc-mr1-dev
am: db68688e4e

Change-Id: I0d790959d2e86a970679f5728a5f190f23590f68