Merge changes from topic "fw_container" am: 955d54ac58
am: cf525d0b76

Change-Id: I0d697a69bf4ab5d6567048204eaa50f107eaa0e7