Merge changes from topic "sdk-system-modules" am: e673663551

Change-Id: Ie818382332ea2b0d20c759673a9b9ab9d5eee835