Commits
Tom O'Neill authored and Gerrit - the friendly Code Review server committed 8ec0bbe9706
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18 (cherry picked from commit d22261fef84481651e12995062105239d551cbc6)