Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values" am: af5b90ff45 am: e01fe74110
am: 1b1ecc13c5

Change-Id: I6572a9f3c6c02fcca45342c478391891bf93e3b9