Avoid using arg pointer. am: 76a0b9f6a9 am: 7162c82740
am: 3169fc88c8

Change-Id: Ie4057e507eee470c3e0759b23287b7f78c95c818