Merge "Fix issue #109746350: startWatchingMode fails on P" into pi-dev
am: e6fde14579

Change-Id: Ifd929e3f72272ae0f4f451e9aa046ca49ff73ebb