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

Change-Id: I51d98f21b51292476e90813d63fa8cc56d007f0d