Test: manual Change-Id: Ib2164555b3cbe47773436a43ed44a0bb6dbc5615 (cherry picked from commit c1abdcd5)