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

Change-Id: I107af26f764b751a2d8ca849a8a3d7360aa2493d