Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04

Change-Id: Ia8dd974c1c6f3d2fd1de6b67c0fe76a0407c02e5