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