Merge "MAP: Disable DEBUG logs" am: 4603b57636 am: c1d78b5eec
am: c5d7b78b52

Change-Id: I82de504bc9b7acb20e0d96cd46ea847afd4a76f5