[automerger skipped] [DO NOT MERGE] Fix NumberFormatException for launcher.
am: d49fe3130e -s ours
am skip reason: subject contains skip directive

Change-Id: I0cf993f3f7a125a7b4853143cec4cf04d5ad8b73