Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp * commit 'b9881e6b94607334673566493c904f6741087938': Adding more DL Manager tests.
Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp * commit 'b9881e6b94607334673566493c904f6741087938': Adding more DL Manager tests.