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

Change-Id: Ia19f5f12fc7956ad009253019cd1baca63797d3d