Merge changes from topic "fw_container" am: 321b208f0f
am: 33b2e3d7ac

Change-Id: I6acde38983edf34e2bd4cb0f133534ca928319c1