Merge "Fix usage of obtainMessage()" am: 618e062f2b am: e949cf159a
am: c90502f35d

Change-Id: Ica107b69203abb6bdedda96caf4ba3c9e802eabc