Merge "Fixed AccessPreference listener." into nyc-dev
am: 40c228d

* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
  Fixed AccessPreference listener.

Change-Id: Idca40034b476faf3be1a83a3e8cb224b8c3c8680