[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: f5078dbc67 am: 7402deddc7 -s ours

am skip reason: subject contains skip directive

Change-Id: I626f2f3dae5a36320a32ded0ddab88ab081888c4