Test: manual, connect with MTP and PTP Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9 (cherry picked from commit f7ec1680) (cherry picked from commit efb865ac) (cherry picked from commit 5954d210)