Merge "Use placeholderCount-1 if using default layout." into oc-dev
am: 260d6c6e8c

Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6