Merge "Refine documentation of getNativeTid() function" am: 4fb43701bf am: e88049cc3b am: e4da80c040

Change-Id: Iaf947f40b918d14bc3c6d4b3835110d659ff1328