Merge changes from topics "search_ripple_clipping", "search_text_overlap" into pi-car-dev am: 9f65343a05 am: 0ef5b07ab2 am: 2d29978062
am: 4a9df1e780

Change-Id: I9d9d845bb1b6da23868abdf071b3807d4d411952