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

Change-Id: I233e88ba2a86dc03fb08626ac91b38ca1589d0a1