Merge "Add implicit output instead of double rules" am: a72480b05e
am: 9847a510e8

Change-Id: Ieccd3001446f212e083718373f1dbe438ba98d6e