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

Change-Id: I5eab18910ee87f9f990cf251dd9bd9333ba971fa