Merge "[NAN] Update API: replace looper with handler"
am: 0027ddf990

Change-Id: I6d3934255c9c6e8085830eeab527479b292bac07