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

Change-Id: I2b39ff45bcdbd29228720c2abc10a59d1f0480c1