Merge "PIP: Support accessibility" into nyc-dev
am: 34a96e704e

* commit '34a96e704e6bc12cc06d186ad7a344706a8afb5b':
  PIP: Support accessibility

Change-Id: I1eb23bb5f0db795b9196a7d7e311126ba5cf7e39