Merge "Fix API Review issues." am: d2a4a1cd8d
am: 3fe41b09b8

Change-Id: I34f66440faf1e74af732ffbcdea9ec739b9d51e3