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

Change-Id: Ie13e48d42331aec21ca573e8540eb4305c60655d