Test: manual Fixes: 153679985 Fixes: 156631526 Change-Id: I97baf78dde16160845bd4f093a495f588b5dcd15
Test: manual Bug: 145530620 Change-Id: I18e3bc7790a008f4da3fb5f02d93c72f37cc419e