Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee am: 0233f238 am: 4bc10545 am: d571c9c0 Change-Id: I4c97bd3d6f7baa1c48d7061b66bbacd8ed4153f5