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 am: 3b7d90c024 am: f035e8b411
am: 8dc64b729b

Change-Id: I1b83d758c57b21c574de55e4de3a80283d9b7f56