Merge "tombstoned: fixed tombstones failed issue" am: 894da4e0fd
am: f8bb1eb5c5

Change-Id: Idcdc3d1828409ddef7fb10283e2a369e69dbd2a8