[automerger skipped] Merge "Fix Fi activation on Q" am: de2e9e39 am: dd032d16
am: 7be21989 -s ours
am skip reason: change_id I61dcb5ca5647bdc38bfe7f0e00104888a52e949c with SHA1 22f0ad18 is in history
Change-Id: I31b1747798b6fb5d0610162e7a98077cbb54c18b