Merge \\"Don\\'t depend on a phony target\\" am: 90cd97fd11
am: b3399931a5

Change-Id: Icfcf65820a3cbe9d2f36b819940f43103606b7af