fixing location

Change-Id: I38f9d00fed88d524904db098f28ee938452306e7
Merge "fixing location" into production