Merge "Test NetworkStack.getService" am: c538baa3 am: 407d4166 am: 049f6282 am: 49d3bab7 am: 3b8abd76 Change-Id: I797b846dec64ffc0caf20b720a3ce0b03694829a