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