Simpler caret

Bug: 30527159
Change-Id: I674de149e613c7adb567a13a288baa9877d36112
3 files changed