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

Change-Id: I74bd0adcc8acc588c134fdb74fe4cc87378e677c