4.4. AOSP-OpD initial

Change-Id: Ifde29a2bb757e2ffd73d93d681d699d093ef8ed2