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