Merge "API Review cleanups." am: f2a5615087 am: 1ce250aaea

Change-Id: I4944712c81c87749d5f15ec90e2feb85619fecc5