Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d93003808a am: 46c656ecd6
am: 90b8e6a59f

Change-Id: Idf4154bc42e1a8682593128d04a26a0b25489ea2