Merge "Fix confirm lock UI theme." into nyc-mr1-dev
am: 0c1d06e3a1

* commit '0c1d06e3a1aed3d66058b6e4f5d9c2e91ffd9220':
  Fix confirm lock UI theme.

Change-Id: I1ba27c48549cdfbeca72572ad5118690f05061eb