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

Change-Id: Ibc7a143c6db3d9ca2ac79bc06876136399f4d54b