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

Change-Id: I9b36df6c52c09c3492e623a4ddbd97c4c4944771