Merge "Make notification match the mocks." into rvc-dev am: 1d5934de3d

Change-Id: Iec0b9de8ad8aef2474810a28e92cdc69c8606469