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

Change-Id: I844b8a49d78988b4bf5cffbce04c9b4b4e3469ca