Merge "revent NFE in SystemUI when parsing invalid int (2)"
am: a5f53a59c7

Change-Id: I1b0b6e8c7c01cf02426d1cbeec9196b285d6283a