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