Merge commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee' * commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee': Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
Merge commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee' * commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee': Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).