Test: manual Fixes: 184695659 Fixes: 183949048 Fixes: 184695652 Fixes: 185271315 Change-Id: I79a937d7d64e6bdf0014ce3f939e6e96690556b9
Bug: 137396965 Test: manual (cherry picked from commit 84b593d592a74aeddfce453bc8700180192199ed) Change-Id: Icac4000bd7323583f8a5f462ccb40826a4151765