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

Change-Id: I7c51ca67c5e0b4418a0752768a60cabc210a6432