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

Change-Id: Id74e92bd7fea99e94536f4d3e992828aa84aa671