Merge "Unsupported app usage API cleanup" am: a2b2183a24 am: ff98c6d69f
am: 940dd816a3

Change-Id: I571ad85a3e643459c3040ee4ccb3e3e2d84c741a