Fix exploit where can hide the fact that a location was mocked am: a206a0f1 am: d417e548 am: 3380a775 am: 0a8978f0 Change-Id: I693665a57465ec57f946fad57cda9ce48389408f