Merge "Camera: Fix map access" am: 8796d95475
am: f17dcdaea9

Change-Id: I72e9146ed8d21974af3cfe8b209571ebe8c93a3b