This fixes some padding issues that broke apps during the last update. Change-Id: Icdce5231f4497f8f0be0ab842a03cbfdfc501c5a