This patch set fixes two unaddressed but commented errors in patchset [0]. [0] https://review.gerrithub.io/#/c/398715/ Change-Id: I0360ba8c48e3c578bc84a9839ef421c326c008f0 Signed-off-by: Tin Lam <tin@irrational.io>