Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
am: 9a22ccd
* commit '9a22ccde2f0fe216e59ebf512e2846ff26f0b753':
Change-Id: Iffe9ac9c0e0307bb86f5920c8b1df465ccf70bbe
This commit is contained in: