Merge changes from topic 'fast-bss-transition'
am: f301986727

Change-Id: I0b0334f193120d379031d9790d68bc2840254391