Merge in history of cedf84d35ab127dd24f9bcbf8b8339518d0e8928 into
klp-dev.

Bug: 32956747
Change-Id: Ie58e6c2cb6cd75befd68e2d8de21d555be30c6ee