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

Change-Id: I38d2e1449400eab227c0b8b5bdf359467b81aff1