Merge "Clear the right data pointer."
am: 24a56c6207

Change-Id: I81be126ea1ca97b4879196ac6ffd9d98c2ac75ed