put misc fixes on a branch until CR happens

Change-Id: Id990b0e54caaf56e3274ee6e023f8ebdef752680