Граф коммитов

412 Коммитов

Автор SHA1 Сообщение Дата
Satish Singh
3bd1aff8fb Release 5.0.0.153
Release 5.0.0.153

Change-Id: I30b27c1d77de35cacb94e0b1ac3f384e87dd7ece
CRs-Fixed: 688141
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
033aaebf05 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirFTUpdateKeyInfo
Replace tSirMacAddr with cdf_mac_addr in struct sSirFTUpdateKeyInfo.

Change-Id: I427217dfb4f08dde6bef874de6d68ca5281502e0
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
fbdb243908 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirSmeSetContext Req/Rsp
Replace tSirMacAddr with cdf_mac_addr in struct sSirSmeSetContext Req/Rsp.

Change-Id: If4f75c162dbb4156d462a927033f94b9170a518f
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
e3b61cc4b7 qcacld-3.0: Remove obsolete struct sAniGetStatsReq
Remove obsolete struct sAniGetStatsReq.

Change-Id: I8478e8d94f00b63ff2926ec4ea4e3dd7f271de13
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
24dab28011 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirAddtsReq
Replace tSirMacAddr with cdf_mac_addr in struct sSirAddtsReq.

Change-Id: I9a9f4cfc2185859c30d56ec4bc98891c9895531d
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
0fcbab2fe4 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirDelts Req/Rsp
Replace tSirMacAddr with cdf_mac_addr in struct sSirDelts Req/Rsp.

Change-Id: I66f2b191b1eb823d395f70fc2c66697b377c7482
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
1e054ed6f1 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirAggrQosReq
Replace tSirMacAddr with cdf_mac_addr in struct sSirAggrQosReq.

Change-Id: I1f58cf95eb3028ef763cd624fa05dcdc288d820e
CRs-Fixed: 898864
2016-02-17 15:20:46 -08:00
Srinivas Girigowda
531a667f6c qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSmeIbssPeerInd
Replace tSirMacAddr with cdf_mac_addr in tSmeIbssPeerInd and
tSirIbssPeerInactivityInd.

Change-Id: Ie83aa414e312431aeb7f730a3f8027ea960acc36
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
430bfc3cab qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSmeMaxAssocInd
Replace tSirMacAddr with cdf_mac_addr in sSmeMaxAssocInd and
tSirSmeGetAssocSTAsReq.

Change-Id: Ie36a22b5ee5c823833981b51ef91525f6c6af692
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
05123e5051 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSmeCsaOffloadInd
Replace tSirMacAddr with cdf_mac_addr in tSmeCsaOffloadInd.

Change-Id: Iaf4357b2da216d9f11ca35331d45bff5193a2ee9
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
4c9722cde0 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in WowlEnterParams
Replace tSirMacAddr with cdf_mac_addr in WowlEnterParams.

Change-Id: Ifc2edce83693fb01ef4ea642727902d493347225
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
c250b07891 qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirUpdateAPWPSIEsReq
Replace tSirMacAddr with cdf_mac_addr in tSirUpdateAPWPSIEsReq.

Change-Id: Ia6d8ea2523257caac541c84d10b7e6a81afc606b
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
2087d8cb3e qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirChangeBIParams
Replace tSirMacAddr with cdf_mac_addr in tSirChangeBIParams.

Change-Id: I21823288cb43379625ec892967eab432c89510cc
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Srinivas Girigowda
2a542e63fa qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSetHT2040Mode
Replace tSirMacAddr with cdf_mac_addr in tSirSetHT2040Mode.

Change-Id: I802cd0353e6a6408f911ccf26a80b938be8a6e48
CRs-Fixed: 898864
2016-02-17 15:20:45 -08:00
Sushant Kaushik
28556aa279 qcacld-3.0: Fix static analysis error in limProcessTdls.c
qcacld-2.0 to qcacld-3.0 propagation

Currently while populating 11a and 11b rates, there is
no bound check for rateset array. This can result in buffer
overflow. As a part of fix add bound check to avoid any
buffer overflow for the rateset.

CRs-fixed: 798054
Change-Id: Ib42f5de642ad54d5c2a1ccdab37d88928b98af01
2016-02-17 15:20:45 -08:00
Yuanyuan Liu
44748d460e qcacld-3.0: Add support of setting FW debug mode
FW needs the debug mode from WLAN INI file. After parsing INI file,
WLAN driver passes the mode value to platform driver, which uses
QMI message to exchange information with FW.

Change-Id: Ifd01b18bcfafad2344196d80ab17c605cca35972
CRs-Fixed: 942237
2016-02-17 15:20:45 -08:00
Naveen Rawat
83622ef789 qcacld-3.0: For LFR 3, save reassoc frame sent OTA by firmware
In LFR3 reassoc frame is sent by firmware and host or supplicant is not aware
of its content. Because of this supplicant does not have complete information
to perform EAP exchange with authenticator if fresh EAP exchange is requested.
To fix this:
1) Take the reassoc req frame passed by firmware and save that to pe session
   This frame will then be passed to supplicant through usual path.
2) In case of FT connection, do not pass key replay counter attribute to
   supplicant.

Change-Id: I51dd8004c910b45c7f25e9cd140448e592b096b3
CRs-Fixed: 943711
2016-02-17 15:20:45 -08:00
Naveen Rawat
f2a13f96c8 qcacld-3.0: Fix rrm capability update from config ini file
Get rrm capab from mac_ctx in function sme_get_config_param().

This ensures that subsequent calls to this function will correctly
update rrm config.

Change-Id: Iddaae66b94ccaa127f08fd0a897bc986a959a0eb
CRs-Fixed: 955114
2016-02-17 15:20:45 -08:00
Naveen Rawat
b13bf0365c qcacld-3.0: Move 5GHz channels ahead of 2 GHz for Early Stop
In case prefer 5 GHz preference is set, move the 5GHz channels ahead
of 2GHz channels in channel list as used in Early Stop Roaming Scan
feature. This ensures that while roaming, when these features are
enabled DUT will scan 5 GHz channels first and roam if a candidate
AP is found.

Change-Id: I96d997560a3eca5fd378aa3ed78c5766d097cafd
CRs-Fixed: 951959
2016-02-17 15:20:45 -08:00
Houston Hoffman
6f8f7e6397 qcacld-3.0: Recheck firmware indicator register after enabling interrupts
qcacld-2.0 to qcacld-3.0 propagation

We suspect that the firmware indicator interrupt is being dropped when
the firmware indicator interrupt is disabled.  Check the firmware indicator
after reenabling the firmware indicator interrupt.

Change-Id: I600bd9dfae99ab96dfaf7e3448cef9128f8b7357
CRs-Fixed: 925315
2016-02-17 15:20:45 -08:00
Houston Hoffman
6666df7fab qcacld-3.0: completion_freeq_lock needs initialization
Initialization of completion_freeq_lock was removed as part of
removing the completion thread.  The lock still protects the
variable num_sends_allowed for copy engines used for sending.

Change-Id: Ia52d2c1b839d2ccfedbd175f1b8f60f953d08203
CRs-Fixed: 951563
2016-02-17 15:20:45 -08:00
Houston Hoffman
a575ec2fa4 qcacld-3.0: Record polled completion processing
Since the wmi tx copy engine's completions can be
processed in both its tasklet context and through
ce_per_engine_servicereap on a polled basis, we
wish to be able to distinguish the when each is used.

Change-Id: I5892eeeab4e1c7e4c35b958d98db7ad0293ec24f
CRs-Fixed: 951569
2016-02-17 15:20:45 -08:00
Houston Hoffman
5cc292bf4c qcacld-3.0: Make ce_init_ce_desc_event_log not static
Fix a compilation error for perfbuild.

Change-Id: I26950eddb8c0f0835cf1faf145f7997a601f2339
CRs-Fixed: 955059
2016-02-17 15:20:45 -08:00
Vidyullatha Kanchanapally
74ab29827c qcacld-3.0: Post message to SME upon DelBSS/DelSta failure
qcacld-2.0 to qcacld-3.0 propagation.

This fix ensures that a response message is sent back to SME if
a DelBSS/DelSta failure is returned by firmware, without which SME
command can get stuck.

Change-Id: I42425809ef93d447af0b34aee05e601e30a18ccc
CRs-Fixed: 810491
2016-02-17 15:20:45 -08:00
Manikandan Mohan
7167413bb0 qcacld-3.0: CL 1427715 update fw common interface files
qcacld-2.0 to qcacld-3.0 propagation

WMI changes to add reassoc_req_frame in wmi_roam_synch_event
add WMI_INIT flag for special WOW platform that no need pcie reset

Change-Id: Ica7653166239e5590d1daa62ec46971d8c905915
CRs-fixed: 865207
2016-02-17 15:20:45 -08:00
Manikandan Mohan
3ef9f3fce6 qcacld-3.0: CL 1427469 update fw common interface files
qcacld-2.0 to qcacld-3.0 propagation

WMI event update to add dd_profile field to RC_TX_RATE_SCHEDULE
and WMI_SCAN_EVENT_FOREIGN_CHANNEL_EXIT

Change-Id: Ic9ba6dd82b2c6ea3d8894665270838a93a702f38
CRs-fixed: 865207
2016-02-17 15:20:45 -08:00
Manikandan Mohan
b42d7d297d qcacld-3.0: CL 1426046 update fw common interface files
qcacld-2.0 to qcacld-3.0 propagation

WMI event update for SMPS complete

Change-Id: Ifb8583d96bc634c5570b538aac2cc93de9f9efcd
CRs-fixed: 865207
2016-02-17 15:20:44 -08:00
Manikandan Mohan
f40f47c932 qcacld-3.0: CL 1424628 update fw common interface files
qcacld-2.0 to qcacld-3.0 propagation

Update for green AP feature related WMI TLVs and debug log ids

Change-Id: I1e7463ee201572ec6bd4cdcb681524fa1c68c82a
CRs-fixed: 865207
2016-02-17 15:20:44 -08:00
Ryan Hsu
09c45a93c9 qcacld-3.0: hdd: Add EGAP interface and ini configuration
qcacld-2.0 to qcacld-3.0 propagation

This change introduces 4 ini parameters to configure to firmware
    - gEenableEGAP:   forcely overwrite firmware feature capb
    - gEGAPInactTime: inactivity timeout value
    - gEGAPWaitTime:  wait timeout value before enter EGAP mode
    - gEGAPFeatures:  the feature flag firmware would support
        WMI_AP_PS_EGAP_F_ENABLE_PHYERR_DETECTION       0x1
        WMI_AP_PS_EGAP_F_ENABLE_PWRSAVE_BY_PS_STATE    0x2
        WMI_AP_PS_EGAP_F_ENABLE_PWRSAVE_BY_INACTIVITY  0x4

Integrate the hdd_wlan_kick_green_ap to execute the Green AP
and EGAP features, depending on the ini and also the tgt_cfg
capability flag,

Change-Id: Ic5db3990aa0a028ed700f6e2f60a11e75c0f1ed1
CRs-fixed: 929063
2016-02-17 15:20:44 -08:00
Ryan Hsu
f66f128fe1 qcacld-3.0: Add Enhanced Green AP interfaces and event handler
qcacld-2.0 to qcacld-3.0 propagation

The firmware reports the Enhanced Green AP (EGAP) service
(EGAP_SERVICE) feature flag to indicate the support of EGAP
feature.

The EGAP is to offload the legacy Green AP feature to firmware
in order to aggressively enable the Green AP other than wait
for host control latency.

Add the knob to hold the EGAP infomation when firmware support
it, also populate the information up to hdd target config.

And then add a SME interface to allow hdd layer to configure
the EGAP configuration.

Change-Id: I9be927369e7cf07731f8e9ba49d65224e05c340b
CRs-fixed: 929063
2016-02-17 15:20:44 -08:00
Deepak Dhamdhere
efcc4aa288 qcacld-3.0: Remove #ifdef FEATURE_WLAN_LFR from SME
The condition #ifdef WLAN_FEATURE_LFR is used to include some of
the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.
Remove #ifdef FEATURE_WLAN_LFR compiler flag from SME so that the code
will always be compiled in.

CRs-Fixed: 936683
Change-Id: I86b9e3dee6b92c89a54de6df769800c31fc3ad17
2016-02-17 15:20:44 -08:00
Deepak Dhamdhere
b45399a48b qcacld-3.0: Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING from SME
The condition #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING is used to include
some of the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.

Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING compiler flag from SME
and CSR so that the code will always be compiled in.

CRs-Fixed: 936683
Change-Id: I63a43b7cfd9360341d4ac4126cbf9fc8ac89071a
2016-02-17 15:20:44 -08:00
Deepak Dhamdhere
ec64739635 qcacld-3.0: Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING from HDD
The condition #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING is used to include
some of the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.

Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING compiler flag from HDD so
that the code will always be compiled in.

CRs-Fixed: 936683
Change-Id: I777d48f26aea36383747281bd4fef2eadc7beefb
2016-02-17 15:20:44 -08:00
Abhishek Singh
1265091647 qcacld-3.0: Delete preauth session in case of deauth from host
qcacld-2.0 to qcacld-3.0 propagation

The preauth session is not deleted if the deauth is from host
(eCsrForcedDeauth).
Adds the check to delete the preauth session and stop the
preAuthReassocIntvlTimer timer, in case of deauth from host.

Change-Id: I181344b0f3a41ff5c3a77f30b4c8cf80557c23b5
CRs-fixed: 649521
2016-02-17 15:20:44 -08:00
Ganesh Kondabattini
0b4f0c6c16 qcacld-3.0: set TX_USAGE flag for bss key in AP mode.
qcacld-2.0 to qcacld-3.0 propagation

Set TX_USAGE flag for default key (BSS key) when using WEP40 or
WEP140 encryption in AP mode.

Change-Id: Icb4411410d84b05a47f193ffbd632445f736246e
CRs-Fixed: 940725
2016-02-17 15:20:44 -08:00
Abhishek Singh
2b0c3e2ced qcacld-3.0: If RSN IE is present ignore WPA IE to get cbmode
qcacld-2.0 to qcacld-3.0 propagation

if AP has RSN IE and supports AES, driver goes on to check
WPA IE and if it contains only TKIP in unicast cipher, it
sets cbmode to 0 (20Mhz).
Added a check to ignore the WPA IE if RSN IE is present and take
decision on cbmode with respect to RSN IE only.

Change-Id: I4eaf8a2d6a9f3a43e74e606045af995fbaa800ad
CRs-Fixed: 739345
2016-02-17 15:20:44 -08:00
Sreelakshmi Konamki
2ad401a79d qcacld-3.0: Make data length as zero whenever we free the data
qcacld-2.0 to qcacld-3.0 propagation

In limSendSmeJoinReassocRsp API, assoc req, assoc rsp, ricData, tspecIes
are sent to SME layer if corresponding pointer in psessionEntry is
not NULL. There is bug here where the pointer is NULL but the length is
non zero. Because of this data is copied at incorrect offset and data
at SME layer is not at right offset leading to corrupted IE in
next re-assoc request.

Fix this by making length as zero whenever we free the data.

Change-Id: I4ba4ff49e56bc2f2758d869eae8ff9370b0c0489
CRs-Fixed: 932712
2016-02-17 15:20:44 -08:00
Ganesh Kondabattini
6798e7829f qcacld-3.0: Transmit tdls mgmt frames only for STA in authenticated state
qcacld-2.0 to qcacld-3.0 propagation

Before transmitting the tdls mgmt frames the STA should be
connected to AP and it should be in authenticated state.

Change-Id: Id79d4e6ad55a6b80e2fac2369f48bedf6551bcd6
CRs-Fixed: 893784
2016-02-17 15:20:44 -08:00
Sreelakshmi Konamki
c1e4966db6 qcacld-3.0: Add missing MTRACE log in HDD
qcacld-2.0 to qcacld-3.0 propagation

Currently, MTRACE logs are not captured for the events posted
from SME to HDD. So, add missing MTRACE log in hdd_smeRoamCallback()
and also add missing eRoamCmdStatus enums in get_eRoamCmdStatus_str().

Change-Id: I26ef8c651b7b873939341b643056ff977a40ea19
CRs-Fixed: 855875
2016-02-17 15:20:44 -08:00
Sreelakshmi Konamki
c13be71c78 qcacld-3.0: Changes in Protocol Stack logs from numerical values to string
qcacld-2.0 to qcacld-3.0 propagation

As a part of logging enhancement,to make logs more
interactive, changed pmcstate,scanType etc from
numerical values to human readable string in
Protocol stack.

Change-Id: I589088c2c5fd0afa106a1d0773a2ff525b0dd083
CRs-Fixed: 638916
2016-02-17 15:20:44 -08:00
Sushant Kaushik
109daae06e qcacld-3.0: Set peer staId for management frame.
qcacld-2.0 to qcacld-3.0 propagation

Currently for sta mode while sending management
frames such as auth, assoc, reasssoc,deauth,
diassoc driver sends selfStaId. This results
in frames going on the air with the self data
rate and not the data rate supported by peer.
As a part of fix, make sure that the peerStaId is
used for sending above management frames.

Change-Id: Ia368ff13aed1002600f5fb3ad55c3d20106d586a
CRs-Fixed: 826260
2016-02-17 15:20:44 -08:00
Abhishek Singh
1ae6563822 qcacld-3.0: Do not send DEL BSS to FW if ADD BSS fails
qcacld-2.0 to qcacld-3.0 propagation

Even though ADD_BSS fails the driver tries to send DEL BSS to
firmware which will crash upon receiving DEL BSS.

To avoid this crash do not send DEL BSS to Firmware if ADD BSS
fails and just do cleanup.

Change-Id: Ieabf241c8277ae76bb5f491f9d8a2b783d8ea47e
CRs-Fixed: 929249
2016-02-17 15:20:44 -08:00
Vidyullatha Kanchanapally
52249826fc qcacld-3.0: Error handling in Roaming code #2
Qcacld-2.0 to qcacld-3.0 propagation.

This fix contains the following changes
1. Ensure rx mgmt packet is freed in all cases.
2. Fail preauth if the pre-auth response timer
   failed to start.
3. Correct some logging and remove unnecessary code.

Change-Id: Icd3a12ba8878de5bad7ff1125ba8be123dfae4eb
CRs-Fixed: 808756
2016-02-17 15:20:44 -08:00
Krishna Kumaar Natarajan
b2225b1611 qcacld-3.0: Check for session validity in pe_delete_session
Check if PE session passed to pe_delete_session is valid
before proceeding with the deletion.

Change-Id: Icfe54e8bc286f14ea757b0619c067cc74ce87492
CRs-Fixed: 948924
2016-02-17 15:20:44 -08:00
Krishna Kumaar Natarajan
62bd6b89ab qcacld-3.0: Initialize PMF timer in create session
Initialize PMF comeback timer in PE create session.

Currenlty PMF comeback timer is initialized in join request and
destroyed in delete session. In offload cases, PE session is
created without join request resulting in destruction of timer
which was not initialized. Add timer initialization in
pe_create_session.

Change-Id: I3dba6713b2bf64cc69f0f2d8322293ff763c0989
CRs-Fixed: 948924
2016-02-17 15:20:43 -08:00
Kiran Kumar Lokere
24e4dc9eaa qcacld-3.0: Log the rssi info from FW in sta kick out event
qcacld-2.0 to qcacld-3.0 propagation.

Log the RSSI info of the disconnect if the STA disconnection is
due to STA kick out event from FW.

Change-Id: I0fad3f8d0e7990f4211b7840bed7605a4b97f3cb
CRs-Fixed: 874197
2016-02-17 15:20:43 -08:00
Krishna Kumaar Natarajan
04b1a36cf7 qcacld-3.0: Check tdls off-channel passed is not a DFS channel
qcacld-2.0 to qcacld-3.0 propagation

Add check to validate if non-DFS channel is passed as
TDLS off channel via driver command and INI config.

Change-Id: I6696c47d438bdcc1b8733241e60ca5c52fb1022f
CRs-Fixed: 915972
2016-02-17 15:20:43 -08:00
Kiran Kumar Lokere
ec4bf277c7 qcacld-3.0: do not process HT IE change if RoC is in progress
qcacld-2.0 to qcacld-3.0 propagation.

Ignore HT IE change if RoC is in progress because as
part of HT IE change we will try to change the channel
parameters which use the same callback as RoC. So if
we try to change the channel parameters if RoC is in
progress we will overwrite the callback causing problems
in the upper layers which are expecting a notification.

Change-Id: I6bace6dd2bd40728ece94e3efe59f3e7038a4e6a
CRs-Fixed: 710027
2016-02-17 15:20:43 -08:00
Jeff Johnson
b7ab97b169 qcacld-3.0: Relocate key adapter fields
This is a qcacld-2.0 to qcacld-3.0 propagation.

A crash was observed internally where wlan_hdd_ipv6_changed() was
accessing unmapped memory.  This function has logic which looks at key
fields in the netdev's private data area to make sure the netdev
belongs to this driver before it further utilizes the netdev.  The
problem with this logic is when it is invoked with non-wlan netdevs,
if those netdevs were created with small private data areas, then the
offsets at which the key fields would exist in the wlan netdev may
fall outside the memory mapped for those other netdevs.  In order to
avoid accessing unmapped memory in those cases, relocate the key wlan
netdev fields to the beginning of the wlan adapter structure.

Change-Id: Idb830fd18e5724a684505c9d110f6f1de5622eac
CRs-Fixed: 946373
2016-02-17 15:20:43 -08:00
Jeff Johnson
b0435d7b87 qcacld-3.0: Relocate init of tx_action_cnf_event
HDD has a completion variable which is used to synchronize the sending
of an action frame with the send confirmation.  Proper use of a
completion variable requires a specific sequence of steps:
- Initialize the completion variable
- Perform the activity that has asynchronous processing
- Wait on the completion variable

Currently HDD does not correctly follow this model for sending action
frames; it incorrectly initializes the completion variable after it
has invoked the UMAC function which sends the frame.  This creates a
race condition whereby the TX could complete and set the completion
variable before the completion variable is initialized, and then when
the completion variable is initialized the fact that the activity has
already completed will be lost.

In order to prevent this race condition and conform to the sequence of
steps required for proper completion variable usage, relocate the
initialization of tx_action_cnf_event.

Change-Id: Ibc54b8dd62c3a828d1a43922d89e7970af325f6e
CRs-Fixed: 950132
2016-02-17 15:20:43 -08:00