Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
am: 3eda32cc71

Change-Id: Iacbf01ae85184c019bb462a7cf55efa2bb4645d5