BUG: 129307152 Test: Uploaded local build with modified host image Change-Id: I82626a967a5fa1bd8e5bd513379c4ec53d5802f7
mentioned in commit a8610c86