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

Change-Id: Ie5896c17bb41efbd4a627b14876abca0f177771e