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

Change-Id: I7fbdde086630a10a4dc324da9aa336bb1f565d9d