Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e am: 652aa82d7e
am: dff2c71b86

Change-Id: I0069a17cd38d628a53de46c42b3a0adb82b577b5