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

Change-Id: Ic1d48ffa1f6ae4e4e7eedf5a5da29fc50a8980bb