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

Change-Id: I30c2e7b3759938c76e7b2ad73f62b44a13823645