Merge "Fix API Review issues."
am: d2a4a1cd8d

Change-Id: I4775132fe1cf3ee656d2e2e7cb91ecc002b5da60