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

Change-Id: I4da7246824391d57d7ca026969ea5157e159873e