Make it configurable for watch Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
126f4057
5ba2f230