am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev

* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
  Ignoring FUL unlock signal if user changed fixes b/7572354