Merge "Update sample app for the inline action API change" into rvc-dev am: b0467a5d48 am: dc5b5c0327

Change-Id: Ibb2e21e96ade8146af4ba36f102d3a0b584d9982