Allow msm-3.4 conditional to apply to msm-3.5 2/2

Change-Id: I48a0a0992ea77f36e19627cfaad3729de1e98fe2