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

Change-Id: I1c38e535dc13ef8f9cfe63a253038ae1e657170b