Merge "Do not access device maps." am: a06e1c9eef
am: cc99ba7ff5

Change-Id: I5d4e9d0fa886cacf665840afb6abc9b51cd995b2