Test: manual Change-Id: If321158a788ac46fc20f8bfbb67bcbfb154c6018 Fixes: 112526923 (cherry picked from commit e173274e)