Merge changes from topic "thread-stop"
am: f167135714

Change-Id: Ie057b22a93b283b3d52d651b8e00b619c2d58931