New deployment build, more bug fixes for time parsing and fix exception

Change-Id: I848f3ff55a6a367dfb4b854e76115a090b88b0ce