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