Test: manual Change-Id: Ie7ff3eca7a9a02afff0a12d64ec8e40f136ed8d4 Fixes: 118969577 (cherry picked from commit c8a01350)