[automerger skipped] Merge changes from topic "pick-sst-location-iwlan" am:...

[automerger skipped] Merge changes from topic "pick-sst-location-iwlan" am: 19e83aca am: 4b4becfd -s ours am: 96e1e958 -s ours am: f6cc08f7 -s ours am: 5409f4d7 -s ours

am skip reason: Change-Id I5c58322ebcec8886405e25e09754c7f154187efe with SHA-1 3f7dfb82 is in history

Change-Id: I18e5dd9693f620912038359bf252707f52d5ff11