Commits
Michael Wright authored and Yigit Boyar committed 759f9fed70a
DO NOT MERGE Fix conditional when checking for confirm key. Bug: 26914975 Bug: 27599828 Change-Id: I1641a44e860901d2aab83138e47af6dad3ad87b1 (cherry picked from commit 6cbdc339ce8acc77c83576d538a15d6da5ac906c)