Merge "Fix another set of bugs." am: af6a262020 am: df04d3bc93 am: f49aa1323f am: 6b6c2f1efb
am: 465033ab63

Change-Id: I8c50c37e6d33d99b01478f3d4d4373f1ded8b369