Merge "Add APIs from public requests." into pi-dev
am: 7692904a7b

Change-Id: I0eff161e25938a9bb823f730a9c208b94ac2dbac