am d40f5f01: am f86e831e: Merge "Return DEAD_OBJECT if getTimestamp cannot...
am d40f5f01: am f86e831e: Merge "Return DEAD_OBJECT if getTimestamp cannot restore track" into mnc-dev
* commit 'd40f5f01':
Return DEAD_OBJECT if getTimestamp cannot restore track