Merge "Add region padding for app images" am: f741486759
am: 3ab8cf351c

Change-Id: I49bdf8489f68f07d27d71a26081d05c3db740983