Merge "Fix ambient display time unit error" into pi-dev am: a15aa6e2fd
am: 763a3ad4d0

Change-Id: I16a0ac201c253767687b647bcc65f65a4c9da7a0