Merge changes from topic "presubmit-am-9a89763689094e51b347f585fe1f995d"
* changes:
[automerge] Fix crash when unfolding a device. 2p: 9af40986 2p: 1240b477
[automerge] Fix crash when unfolding a device. 2p: 9af40986
Fix crash when unfolding a device.