Merge "Merge "Better guarantee a11y service initial state" into oc-mr1-dev am: c354e022 am: f7836b98 -s ours"