Merge changes from topic "b111394067-new-falsing-manager" into qt-dev am: acd240fbb3 am: 4cc68a30de
am: d10fb72913

Change-Id: I3a51c569dc1d4b64260db8d5585656b2f268af2b