jlo: updates part2

Change-Id: I8be650131de3c7af16b2b7786201e0c778c69e53