these aren't in aosp

Change-Id: I8fe0b150bce22853918f68fdddd11a3f78f02253