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

Change-Id: I802dbee1bcbed3ba79f322bf1d15e6963b046c8f