Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:...
Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e -s ours am: e1b04c98 -s ours" into oc-mr1-dev-plus-aosp
am: 10078857 -s ours
Change-Id: Iaf4466acd516b44f60bf1fd573ad108e30d0e676