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

Change-Id: Id99c2d231ba1f48f822200debfd9a2aa01e79850