Merge commit '18c4aa458ea5c9ee5513fa756da4f5492bb7c5b8' into am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de

* commit '18c4aa458ea5c9ee5513fa756da4f5492bb7c5b8':
  Update accessibility for popup

Change-Id: I77e6834e9f02b95c4beebda52f37ee1a7459df34