Merge "Use Bundle for inter-process message" am: db8e4efd5b
am: 5311da134a

Change-Id: I0b7d8ee5827c97fc761cb1fe102d4b89b364e9f7