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

Change-Id: I49acf0d8cfb091b0aae94ca5756e2d1509dd4e0b