0d69c8dde9
Also add simple prefix matching method. Bug: 255355348 Test: manual Change-Id: I35f2089924d774f3bcc1c05638a5d6b45ed7443f