Test: manual Fixes: 169792886 Fixes: 169793537 Fixes: 169793764 Change-Id: I8ae9efe732b468b8e13e264b0af8f81c596e2e89 (cherry picked from commit 11f2e288)