bugfixes

Change-Id: Icf385b3f322f20d2714de0780da479648edadd14
Merge remote-tracking branch 'pa/jellybean' into jellybean