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

Change-Id: I9a7f790b9d67b8edfad341604493f2b6ee908825