Merge "Add NGRAN"
am: 4ff75ef786

Change-Id: I18dcc1c05ade3e240beb8ca0c2577c7090064bcb