Merge "[NAN] Method renames based on API council feedback" am: dcac00f325 am: 3501748dea am: 6b6c719dd2
am: d48845629b

Change-Id: I45506aeab052bb2585ac5050388606be7bbec1d0