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

Change-Id: I470d78666c959cfaec33f26b6931ba2ea6c0d6c0