am 3403508d: am 31268de0: (-s ours) am 337cf595: Merge "Fix stuck issue on Kovio barcode"
am: 1e2f67725c

Change-Id: I34263f9862dd526eb4419c4e355c00d0d77ac611