Merge changes from topic "fw_container"
am: 321b208f0f

Change-Id: I75201a9a25bc6a3445329a3b43bdf68da623b3e6