Merge commit '198786755a2a99176381a8f61bbce41ae1774ee1' of sso://googleplex-android/platform/bootable/recovery into HEAD
Change-Id: I58c70b75ce71993f31b08081227970eaabf197cf