Merge "Updates to support FEATURE_WATCH devices"
am: c632498ee4

Change-Id: Ib06ab8a90f16aeb25a6395f38547ab53c184e97b