Bug: 182998770
Bug: 171327997
Bug: 170327170
Change-Id: I20db6a698b4d995f94bd592023a2a0b08b1f9548
Signed-off-by: Peter Collingbourne <pcc@google.com>
(cherry picked from commit 70cf1983)