Handler declaration can fit in one line for Plan and Sensor

Change-Id: I77b747ece0feeb373618c8d3ee4ad6a0562d6a91
Merge "Handler declaration can fit in one line for Plan and Sensor"