Merge "Don't install StubDuoModule in tests." am: 4d4dd9cdf3
am: 5b1bee07be

Change-Id: Ieb7d95660cec6ad64acc8d71d81c4b4acc3a513f