Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: b45dabd0ee

Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
tree: e2a735bad1be44971b984dfb0eff426e823d690f
  1. core/
  2. services/
  3. tests/