Merge "Revert "API tweaks""
am: c61bb461b6

Change-Id: I8b9729b9afe1798b84193a4ce09777372585fc27