Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c
am: 462f4cd695
am: 1676898f76
am: fbb7b19880
Change-Id: I4e8598a5ccd70774f1bdaf7d58703102108734a0
This commit is contained in: