(no-ticket) Fix bugs introduced by 34019116 (merge with szkopul)

Change-Id: I742956b5faf44f48e87f130b660465b11b5bfc46
Merge "(no-ticket) Fix bugs introduced by 34019116 (merge with szkopul)"