Merge "sourcedr: Add new features and reorganize code" am: 96ff4b8aca am: 005ddaa276
am: ea3db2c6cf

Change-Id: Iacafac37cadf631892a22ffd1262a0a45d0b3e65