am ce952741: Point fixes to unblock Sprout phone debugging

* commit 'ce95274195d591b34d7e278ea9e34e3786a9d3ec':
  Point fixes to unblock Sprout phone debugging