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

Change-Id: Idf2b0e981ddbae38aeb4838595e303d0b8b1da2f