Merge "Filter changes according to API review" into rvc-dev am: 22d090cb4c

Change-Id: I19b0f45c71b2705f0668f34dfb2da4a80783dd43