Merge commit '0fb4e0fe9f5a1dca37eb3be2ab279601af2336de' of sso://googleplex-android/platform/packages/apps/Car/libs into HEAD

Change-Id: Ib3b335653a6ad145692f0e1bf895b889115eb607