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

Change-Id: Ib0796abe20485873dec2772f57dbd8cedd255dfa