Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e43
am: 1b2ec4f096
-s ours
am: c691528377
-s ours
Change-Id: Ic271833cd6d281d5cf51b8d0e8f385e55d7484e7
This commit is contained in: