Merge "[TNU05] Add no upstream notification" am: b353c7eac3

Change-Id: Id93a2eef90804bcbd35398f9633600fc858be2b1