Merge \"Adding a new getThreadScheduler() method.\" into nyc-mr1-dev
am: 6c92c0eb5c

Change-Id: I34c5380121bd805a0c8afe35ab82cf149ba3e79c