Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev
am: 1d20f2096c

Change-Id: I963c419c063447a54b35aa1dff282cd058368af7