Merge "Use new UnsupportedAppUsage annotation."
am: 9395887931

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