Merge "Remove force FW update at factory reset" into qt-r1-dev
am: 6955738c9e

Change-Id: Ib838fd03f1cbb3780baa1630691f92c77955610e