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

Change-Id: I6297bf2393113fbe5a82d37b533f808e569b1c73