Merge "Delete SrcMap" am: f0323ecd08
am: 56131f6c8f

Change-Id: I8d6bfcf5aa96e478ef7edbb8744e48c63d4e5858