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

Change-Id: If6fbdef531b0c78288679a0e609404de9e43f914
tree: d4ffc291d171e3f590b69d040579f9bf00baa336
  1. tests/