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