Merge changes from topics "search_ripple_clipping", "search_text_overlap" into pi-car-dev
am: 9f65343a05

Change-Id: I839de2cd2a3c1ed27b0e8a34113cb38e1e2bd551