Merge "Add @UnsupportedAppUsage annotations" am: 842e3aa420
am: 20ebeb61a9

Change-Id: Ibcbbe37ffd476ea414a1041c015b8267a46a5402