Merge "Match attributes to actions for pip a11y" into oc-dev
am: 95cf170ce9

Change-Id: I992904b2062bed551ea0587797b99fc26b74711f