Merge "KPF_ constants are bit numbers, not masks."
am: 86c9762dd0

Change-Id: Ie99ca933e9ab56680e3b4cbfb58bde8269a52bb3