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

Change-Id: Ibbe08b672736689917ecd3d6c7aa1b7d792d483d