Thanks to Leo for spotting the missing cell types. Change-Id: I1da48575dcbaeabb504bb1bf9eae8c46efcb295a