Merge branch 'stable-2.15' * stable-2.15: Add test for NPE in account index query Change-Id: I9180a1c70417466bb7b2f1900baa99f36860482e