Changes for a quick, pre-migration bug sprint:

Bug: 19679070, 19716684, 19680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0
4 files changed