Merge "Remove unnecessary right padding from time picker" am: 71a1e5cfe1 am: 314a239612
am: 3c2cafb1cb

Change-Id: Iebb9f81a968093420c320afa2c6fab19e43833ad