Merge "Post runnables instead of sending messages." am: 71317f4a6c am: 71a4792147
am: 31669e8924

Change-Id: Ia7937ea6d29924e1b717430e8330d81e3f7ee9e3