Fix many small nits.

...the interaction of which results in a very bad bug.

Bug: 11648854
Change-Id: I774489e384388f187e72b9ac091ab387c5e1a79a
Merge "Fix many small nits." into pac-4.4