Changes as per API council review.

Bug: 20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
12 files changed