Merge "Add @UnsupportedAppUsage annotations" am: 78f8ffbffd am: 2d86f12796
am: 6c0b6a74d0

Change-Id: Ia62b0542e8267c81fcefb6994d75f377e84f9a0e