Track Cherry manifest

Change-Id: Ie6d2f1a9bc24439ba940e4ada7d0db32f30e514b