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

Change-Id: I442b3b3552c5439dad36fcd2ef319f1fb8a23afc