Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e...
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e am: 1b2ec4f0 -s ours
am: c6915283 -s ours
Change-Id: Ic271833cd6d281d5cf51b8d0e8f385e55d7484e7