Merge "Reworked GenerateDaggerApplication." am: c49c914e53
am: 53040a36bc

Change-Id: I4bdb96e3a58691c52b700fe2307346d4d1209464