Consolidate Recovery settings and add QCOM bits

Change-Id: I200bf814eefba2181658ff884fd547a1bd0c2b58