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

Change-Id: I0d2691a9a7f11fd6f4f1f6ec1a7ece073fad2a06