Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423 (cherry picked from commit 0a8978f04b4cc2e273545568b424756ee5a40a3d)