am cd4bf967: am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Android Git Automerger (1) and others
* commit 'cd4bf967a77b0bc5e84fd40a2cd418e2551f3f7a':
  Fix regression in LEAP