Merge "Removed "last_tab_enabled" flag. END_PUBLIC" am: c8d58599d7
am: 03531e334f

Change-Id: I2ecbba875df2b569a5ed7ee1088e9224d2b03412