Merge "Fix search for values in blkId output" am: 0fbc5af676
am: 56715503b5

Change-Id: I9b24f0bd748a38ca29e2b258a54cd2b9bdcb7cc3