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