Merge "Make notification match the mocks." into rvc-dev am: 1d5934de3d am: 4c2f056a3b am: 80eeb99531 am: bfbc2fcbcb

Change-Id: I1dcefde5d0d2a19a22b20a2c22b5147945e17462