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

Change-Id: I3b186220920c7c7ffaa04eda46984294398a5fb4