Merge "Add more API accesses from bugreports." into pi-dev
am: 677ffbc40b

Change-Id: I5d0bcdb4d69ff86096c125db2c39cf2b3b23133c