Merge "API tweaks" am: 13152049e9 am: cc8f17b2dd
am: aa1483ec38

Change-Id: Id177c76677cbe3c8b0ef6b9a0fcc235ca223c069