Merge "Q card." into qt-dev
am: 13de667fa6

Change-Id: Ia30df6e52c78381860782b282125d9deef9511b5