Merge "Disable searching in archives." into arc-apps
am: 67d6ff2c4c

Change-Id: I16bfc408c7ef208ffc26502d00a63b94ea7a6f7b