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

Change-Id: I5ea3e18bbaec7875b3720febfd4bbdcb97c92883