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