Merge "Revert "Revert "CDD: Relax Overview title count requirement.""" into nougat-mr1-dev
am: 765a3df8b1

Change-Id: I3d1a8f794c78a4c05f3899fb0f36e54bb6f352d9