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

Change-Id: Ic48e156c6d0bbdba48f5f99c828153ed7195cdc3