Filter changes according to API review

Bug: 150244216
Test: mmm;
Change-Id: I52a7df6bbd8a580a4ea6e8bff4f1ee1515acf3f4
2 files changed