Bug: 63077212 Test: CTS basicExtensionTest Change-Id: I9c9b5de99249a6fdd49df1995971c14915f6a7c8 (cherry picked from commit edc88e78)