Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
am: ad27aa11b1

Change-Id: I4a74e401b9c4cdaeb0b27919b03e24b88855edb8