Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0' * commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0': Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0' * commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0': Fix issue #2149145: Safe Mode does not work on Sholes device