Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c
am: f635ce3685
am: ac9ba09d91
Change-Id: Ie736ef335357ee039a9c44429ac61110079ffcde
This commit is contained in: