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

Change-Id: I504afd47b658f45ec5c57dd93f67266c4fd2ce72