(cherry picked from commit 44afe8be) Test: m Test: sailfish boots Change-Id: I9ca93f31f6c20b702b2207333a9d56f6592630b0