[automerger skipped] Merge "Add NGRAN" am: 4ff75ef786 am: 48388d0949
am: 00649c664e -s ours
am skip reason: change_id I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c with SHA1 721084c310 is in history

Change-Id: Ide0fe52a84c514adf10ff6ad1d2262ded619a6a9