Merge "Non-essential tooling improvements" am: 2e734b6ba1 am: 0a99f0a24f am: 83f37987ae am: 8096b08d3b

Change-Id: I2f4d5fad75a995c02a7e824d08ff5c27826fa2ad