Merge "Restrict Emergency Assist API to system image only." into nyc-dev am: d4c5828697
am: 46a3d5abd2

* commit '46a3d5abd2d8959d8d156b8edf773270d24828ca':
  Restrict Emergency Assist API to system image only.