Change-Id: Ieede97abdb8aa68b1c3bde71007ce46a3cb6f96d
Merge remote-tracking branch 'origin/Motion' into Motion

Conflicts:
	src/BaBy_Care/Baby_Care_Activity.py
Change-Id: Iaeaf73d03ca0634d031ec32c967e49db498b56e4