Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a

Change-Id: Ia3b772ad3ae7c26d92f3367a3689579cd00860ab