Test: manual BUG=68147074 Change-Id: Idc9e27512a826bd3ccf9056918f1c7cda5b4ce14
mentioned in commit 998dec57