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

Change-Id: I5b5386866e9b54d38abc9f3e7f06a1e32e4cbfb6
Merge remote-tracking branch 'upstream/kk44' into kk44