Merge "Fix another set of bugs."
am: af6a262020

Change-Id: Ie17cded589e0a930c6ae19b981f320a969a353aa