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

Change-Id: Ie0a4a75684294a723b1974c6daef9b85b2dd86eb