Create symlink as a side effect am: 055cf9a459
am: ffeae783ee

Change-Id: I3fdef784c69d7798f80ea251f444a7afe508221b