Merge "Add missing free after read device info" am: 384bd00de2
am: e1087bb8ef

Change-Id: Id673086ab7e8b66c1009dcba7803a971546fc711