Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60
am: 818eda8a79
am: 1e0a833cfa
am: 2f254d97e6
Change-Id: Ie38964ea8312ee4dfad870782bf7df9c2f46ed33
This commit is contained in: