[automerger skipped] Merge "RESTRICT AUTOMERGE Add test for attaching null application thread" into oc-dev am: 3db16100d6 am: cadae69ccb am: b21d53153a -s ours am: e1354e53c3 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib8cdc8a6e55f19f0d9b414fe88bcadf4d0e4270d