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

Change-Id: I7733930fa5167029ab1f2bfb9b86fffbd6f62d51