Fixes: 157757386 Fixes: 157144647 Test: manual, visual Change-Id: Ibeccc0fe2269aea69b882895fbb1a280cd6bf126