Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Fix searching in "included in" Change-Id: Ic2d72d78852d3c190f03744161873528805b1797