[automerger skipped] Merge changes from topic "pick-sst-location-iwlan" am: 19e83aca9d am: 4b4becfd2a -s ours am: 96e1e95877 -s ours

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

Change-Id: I2b9671c57ca69751ad23109f57d223e5eeba8976