Back-port fixes for b/62196835 am: fd0ca151 am: 3c4d2492 -s ours am:...

Back-port fixes for b/62196835 am: fd0ca151 am: 3c4d2492  -s ours am: 68efc2e5 am: e06843fe am: e11e076f am: 62eca82f am: 83261a8b am: b968d99e am: a1dca329 am: 79c47670 am: faded530
am: 3700014b

Change-Id: Id7dbefd2586c25730efc719bd787cdf70c98c7f0