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

Change-Id: Iea16a4af5118e389814e63c828ed896a87e740c0