Merge branch 'CR_3121_VF2_Hibernation_mason.huo' into 'vf2-515-devel'