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

Change-Id: I9eafd677e57ddf8c03a0c1c06bc9d68cc10e7b42