Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60
am: 818eda8a79
am: 6e69c8342a
am: bf3edbfb14
Change-Id: Ib05563e6a6e7d31a734db82f5467a3ff25d883c7
This commit is contained in: