Adjust sample app for API changes
am: c6b89ec244  -s ours

Change-Id: Ia273a884033470a6b85cff08fea7fcc8d23e32e3