Merge "Add pseudo-filtering on authenticated views." into oc-mr1-dev am: 30d6df4514
am: 760205ea96

Change-Id: I2f55ef450e42a8c9cfb58ab79e74e346af4ea3a8