Linfeng Zhang authored Dec 04, 2017 and James Zern committed Dec 07, 2017

Make a couple of functions inlined, and other small changes.

Change-Id: Icd11b20f0fa2ddb14621df401f95cf0ce2f6be28