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

Change-Id: Ia448d7b73d88f69ab53b0cd888bd25c242aa6d4f