Bug: 170729553 Test: m NoNonSdkCheck: b/170729553 Change-Id: Ic08ac71551a5973e65b696bfd3956d11ec97f397