Merge "Limit notification period when a fast track denied" am: 89a1e53856
am: 66446e6135

Change-Id: I4403db70ddcbcc5f29332342531c33eb12563661