[automerger skipped] Merge "Use subId column of raw table." into qt-qpr1-dev am: 13d5ac1a -s ours
am: 8f0a7052 -s ours
am skip reason: change_id I3b02a68658f472714d3be56c91db39dce7404df4 with SHA1 38ebba72 is in history
Change-Id: Ie54331ef26fca028fef99be6fc09294898dec02c