Merge "Some refactoring for the ShareActionProvider sample." into nyc-dev am: 7f29a15d am: f2336f10 am: 2c5f6279 am: bec6bc04 Change-Id: Ib8b343dc11eaf2e2ddefecd91e8d89caf7266db1