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

Change-Id: Id30b71a301953d8450bd66552a020437c5e91b94