Merge changes from topic 'svcusb'
am: 5e2a2ee39e

Change-Id: I4b628b80e348e25377d0855301374e71cb8f2c64