Merge "Add termination nullptr to signify end of arg list" am: ab54d0d2c0

Change-Id: Ic56fd5d80fb0744e8da06972eba0cfc24a5fb5b2