Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee am: 0233f238 am: 9315a51a Change-Id: Idbfe0550ce51557ff4a38fb7fade93fd01c20759