Merge commit '38789d64f0776bbce6b11df21ac2246af5685269' of sso://googleplex-android/platform/external/avb into HEAD
Change-Id: Ib5209209d5f461e8b67d679227bffb6921cef749