[automerger skipped] DO NOT MERGE RootCanal: Always add default devices am: d15b5edb -s ours
am: 8dbf621a -s ours
am skip reason: change_id I9912dc7a98155972483e1e1dca812ebbae806bdd with SHA1 dbda8935 is in history
Change-Id: I302331b95c9ffa58fd70d102755c27c42c75b130