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

Change-Id: Ib3319a76c813e7be8fc598edf21e77fe1bbc38a3