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

Change-Id: I17f6aa60e40e1b33ea6c1ba571048b33ba49901d