Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad6a
am: c9981f9592

Change-Id: I0d3e630b71db47626f655de12a9e685fb385858e