Provisionally adopted on 2017-10-31

(Also an asan warning fix + few non-functional changes)

Change-Id: I2ff4f34f8b20d2eeb567f2e5b1e57b296a97be82