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

Change-Id: I12827ab0a37fbf7079fdd82b298761beb205113e