Merge "Update a11y when alpha changes" into pi-dev am: b504a2f65b
am: 291adf498d

Change-Id: I226fbf893ff7c92408bb64b7aa4d2a2d529c3232