Merge "Delete SrcMap"
am: f0323ecd08

Change-Id: Ic016892a86e085c128fdcdd3f793cd42b3297ac4