Merge "Allow for empty time suggestions" am: a241a15ccc am: e02dcaa9d1
am: 4fae9dd7c8

Change-Id: I5ba3b458bce9ef89a998bbc4f9b6b24fe4f65c82