Migrate changes for wear samples in development/samples/wearable

Pasted those unmerged changes here.
https://paste.googleplex.com/5842015925305344


Change-Id: I09db13fb695783ba404f8ec75e799569a081f8e0
2 files changed