add "flip_open/filp_close" white list for aw882xx
All of them could be found in the latest abi_gki_aarch64*.xml file.
Change-Id: Ia89d6371a7c097dee12fa78dd9d5acb72e2f581b
Signed-off-by: liaohj <liaohj@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1794660
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Port the spi changes from bq-6125.
when unit suspend, pm_runtime_disalbe() would be called. And
then dev.power.disable_depth number will +1. And its value
will be -1 when pm_runtime_enable() is called.
And if spi bus want to work as soon as system resume, it will call
pm_runtime_get_sync(), which would check the value of
disable_depth. If its value is not 0, spi operation will fail.
The sequence is as following:
runtime_suspend
pm_runtime_disable()-> disable_depth +1
rumtime_resume
pm_runtime_eanble() -> disable_depth -1
spi_sync()
pm_runtime_get_sync -> check the value of disable_depth
But for sometimes, spi operation will earlier than pm_runtime_enable()
called. Then spi_sync() will fail duel to non-zero disable_depth value.
So we add a checking logic before pm_runtime_get_sync() to make sure
disable_depth is 0.
Change-Id: I673363bfd861402b5c54874137b12700ef2df14d
Signed-off-by: wengjun1 <wengjun1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1793166
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Wei Wei <weiweij@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
TCMD use 32bit system, we need to add new
ioctl to make sure tcmd test pass
Change-Id: I255862644691755fb91727c5c0b856a3a80d3670
Signed-off-by: wuwl10 <wuwl10@motorola.com>
Reviewed-on: https://gerrit.mot.com/1791777
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
for EDAC will cause some unuseful panics on debug version, we have to
disable these configs on debug verison, which have been disable on user
version as default.
Change-Id: Ic34b9fb3a516911dfed41eaf38ad29466fdf65bb
Reviewed-on: https://gerrit.mot.com/1790701
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
As https://gerrit.mot.com/#/c/1743071/ do, if enable cabc after setting
brightness when adjust brightness, may cause backlight flicker. So move
cabc enable before setting brightness when adjust brightness.
But still enable cabc after setting brihtness if phone screen on to
avoid peak current.
Change-Id: I625f6cdc8cd6c30e049c13994850932b9653dde9
Reviewed-on: https://gerrit.mot.com/1782873
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
The "wakeup_source_add" and "wakeup_source_remove" functions
can be found in the latest google whitelist, so update the qcom
whitelist for chipone fps.
Change-Id: I5332205b17b5228927f482ac991cd1fe893f72fd
Signed-off-by: wuwl10 <wuwl10@motorola.com>
Reviewed-on: https://gerrit.mot.com/1789294
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This abi is used in utags.ko and it has been added to GKI whitelist so add
it to qcom whitelist
Change-Id: I32d9122e5e685ed6390b9f574a57a216e914065e
Reviewed-on: https://gerrit.mot.com/1788243
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zhenxin Xi <xizx@motorola.com>
Submit-Approved: Jira Key
expose ssr_reason to ss_ramdump so that
bug2go can show it in their record.
Change-Id: Id8fdaa1b5aa279f6a70a42c278c324007b27e758
Reviewed-on: https://gerrit.mot.com/1786969
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yifu Lin <linyf@lenovo.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Move "battery" to "qcom_battery" and change type from
BATTERY to MAIN.
This will allow another driver to control "battery" and
the system will passthrough it to get the information.
Change-Id: I5409be01d769805065a64d05fb5b1666c81fed6b
Signed-off-by: mahj8 <mahj8@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1786691
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Lu Chai <chailu1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
No need it on kernel5.4.
Use ZLIB compression, bootloader also can dump kernel panic log.
This reverts commit 2fc22e11d2fd8c99a306e0d0d41a9ec5e716ff77.
Change-Id: I77323996b0bad2348a121a64d4b46c5c1987747c
Reviewed-on: https://gerrit.mot.com/1786966
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
[ Upstream commit 01c10880d2 ]
We see dwc3 endpoint stopped by unwanted irq during
suspend resume test, which is caused dwc3 ep can't be started
with error "No Resource".
Here, add synchronize_irq before suspend to sync the
pending IRQ handlers complete.
origin-CRs: (CR)
Change-Id: Ice15ecc8286f417a95935ad3bf3368f2a71ae736
Signed-off-by: Bo He <bo.he@intel.com>
Signed-off-by: Yu Wang <yu.y.wang@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Reviewed-on: https://gerrit.mot.com/1373264
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1379348
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Reviewed-on: https://gerrit.mot.com/1449150
Reviewed-on: https://gerrit.mot.com/1751270
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-on: https://gerrit.mot.com/1785340
Force all logs to print.
origin-CR: (CR)
The USB DWC3 is very important and tracking dmesg
is much easier when everything is ON.
Port-of: https://gerrit.mot.com/1307019
Change-Id: Iebde3d9feadde8a3e92acb10baeb97c5ba7e07cf
Signed-off-by: Kenny Kessler <kenny.kessler@motorola.com>
Reviewed-on: https://gerrit.mot.com/1332192
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1391225
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Reviewed-on: https://gerrit.mot.com/1449174
Reviewed-on: https://gerrit.mot.com/1786719
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
os_desc support can be turned off via userspace. Kernel also
needs to correspondingly reset its state if userspace has changed
it. Otherwise this cause os descs to be advertised on drivers that
have no os desc support.
Change-Id: Iee760ba45ceea1f26f4e33b4e52c06be7fd20e44
Moto-CRs-fixed: (CR)
Reviewed-on: https://gerrit.mot.com/1750957
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1785336
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Implement the secure attribute for locking USB access
from the gadget driver.
echo 1 > /sys/class/android_usb/android0/secure
will lock USB access and disable USB enumeration.
Change-Id: I9c7bcb27cfd4ce4f28520d938c604607ec6c2431
Moto-CRs-fixed: (CR)
Reviewed-on: https://gerrit.mot.com/1750996
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1785337
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Add support for a vendor specific SCSI pass through command to
trigger reboot.
SC_REBOOT (0xd7) - triggers reboot into fastboot mode
SC_REBOOT_1 (0xd8) - triggers reboot into normal mode.
Propagated from (CR)
Change-Id: I4fc4839968135a63c594dca69b1dc93699e4a9bc
Reviewed-on: https://gerrit.mot.com/1750946
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1785335
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
From Igor's review with Google, Google requires us to add the following
kernel configs for customer build to enhance the security:
CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_DEBUG_PANIC_ON is not set
CONFIG_BUG_ON_DATA_CORRUPTION=y
CONFIG_SCHED_STACK_END_CHECK=y
Change-Id: Ibccec957ebc66f31c77fddff1419b5bcb6c8f635
Signed-off-by: weimh1 <weimh1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1785753
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
It cause (CR) if cooling device have many levels.
There are NOT any processes to use thermal statistics and it
occupy about 6.7K memory, so disable it, also see this CR.
Change-Id: Ie37378c0a45cb6573be49e6c18b6af18f39f1d74
Reviewed-on: https://gerrit.mot.com/1784457
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Lu Chai <chailu1@motorola.com>
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
The command "kpitrace --stdout --interval=1 --freq --no-proc-cpu"
is not showing freq for each CPU for Racer_turbo (kernel msm-4.19).
It happens because the following file is not present in device
/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state.
To get cpu power stats, CONFIG_CPU_FREQ_STAT should be enabled
in kernel config file.
Change-Id: I6929322cf7ef86a7b8beb19727251f2aa3df1e57
Reviewed-on: https://gerrit.mot.com/1784458
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yonghui Jia <jiayh2@motorola.com>
Reviewed-by: Minghui Wei <weimh1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Some of PC USB3.0 port don't support bcdUSB 2.1 version.
But the phone bcdUSB will focus on bcdUSB 2.1.then USB gadget will
reset continually.Change bcdUSB to 2.0 to compat all PC USB port type.
07-02 08:05:34.853 0 0 D dwc3 a600000.dwc3: Notify OTG from dwc3_gadget_reset_interrupt
07-02 08:05:35.182 0 0 D dwc3 a600000.dwc3: Notify OTG from dwc3_gadget_reset_interrupt
07-02 08:05:35.415 0 0 D dwc3 a600000.dwc3: Notify OTG from dwc3_gadget_reset_interrupt
07-02 08:05:35.647 0 0 D dwc3 a600000.dwc3: Notify OTG from dwc3_gadget_reset_interrupt
07-02 08:05:44.171 0 0 D dwc3 a600000.dwc3: Notify OTG from dwc3_gadget_reset_interrupt
origin-CR: (CR)
Change-Id: Icb46a95226caecc9778c6889a85654f97fa85012
Signed-off-by: liuyc20 <liuyc20@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1383246
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1449152
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-on: https://gerrit.mot.com/1751275
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-on: https://gerrit.mot.com/1785341
QC patch("usb: gadget: f_fs: Fix NULL pointer issues in ffs driver")
fix multiple mounted issue, it will return "ERR_PTR(-EBUSY)" in
ffs_data_new(), but ffs driver only check ffs if is a NULL point,
the next code using ffs still cause ramdump.
origin-CR: (CR)
Change-Id: Ib2d21b2854163883f07475ef97e1e09a1742c617
Reviewed-on: https://gerrit.mot.com/1313122
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1338906
Reviewed-on: https://gerrit.mot.com/1449057
Reviewed-on: https://gerrit.mot.com/1751135
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-on: https://gerrit.mot.com/1785338
rss in statm sometimes is zero value which will affect lmk kill
as it depends on the rss size of each process in lmkd.
Change-Id: Iee0bdf2534fee660e64d8e8221c4dc571e13921e
Signed-off-by: huangzq2 <huangzq2@motorola.com>
Reviewed-on: https://gerrit.mot.com/1668699
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
Reviewed-by: Bingqian Yang <yangbq1@lenovo.com>
(cherry picked from commit 09b4d0ed5f4710c7ee6f263a2faca67846565256)
Reviewed-on: https://gerrit.mot.com/1673149
Reviewed-by: Zhenxin Xi <xizx@motorola.com>
Reviewed-on: https://gerrit.mot.com/1783212
Reviewed-by: Yonghui Jia <jiayh2@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Print thread ID and name of eventpoll wake up source for
debug purpose.
Change-Id: I4d97e74a3ba61bc33600f4c3a3c557ee4d1d0b87
Reviewed-on: https://gerrit.mot.com/1779375
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hongshu Lou <louhs1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
The new added api is necessary for building Exfat DLKM. All of
them could be found in the latest abi_gki_aarch64*.xml file.
Change-Id: I81e08474e7a4196967a557cdd36fc0cad3b5da36
Reviewed-on: https://gerrit.mot.com/1783232
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
The new added api is necessary for building Exfat DLKM. All of
them could be found in the latest abi_gki_aarch64*.xml file.
Change-Id: I53a02ecd583a83b6d44b37e869f8d33784094e00
Reviewed-on: https://gerrit.mot.com/1783216
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
origin CR: (CR)
For nomal gpiochip add logic, gpiochip base value will be down from
1278. And as a result, tlmm gpiochip base value may be a random
value next to 1278. If we want to use tlmm gpio as its real number(
for example, number 21 for gpio21), tlmm gpiochip base must be 0.
So we add this logic to check if its base value need to be defined by
dts configuration.
Change-Id: Ic4ccdf9791673ce81ea49a8653449adabe0b0a4f
Signed-off-by: weiweij <weiweij@motorola.com>
Reviewed-on: https://gerrit.mot.com/1509841
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1780451
Prop from (CR)
If we have usb digital headphone pulled in during bootup. It will occupy
index 0. primary sound card can only use index 1. But in our most audio
code, We assume the primary sound card is 0. This will cause no sound
issue when we use primary sound card to playback and record.
Change-Id: If6635c4b7adef0925af8145d4b728f3cc481b9ad
Signed-off-by: liaohj <liaohj@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1780715
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yuesheng Huang <huangys@motorola.com>
Submit-Approved: Jira Key
pick from (CR)
Some dogfood users reported call has no sound problem, it happens on
the first bootup after BOTA upgrading, if reboot again, everything will
be okay.
According to kernel log, filesystem mount timed out, causes locator
service timed out.
[libfs_mgr]Retrying mount (source=/dev/block/bootdevice/by-name/
userdata,target=/data,type=f2fs)=-1(11): Try again
servloc : init_service_locator: init_service_locator:wait for locator
service timed out
After discussing with Qcom, they suggest to enlarge this timeout value.
Change-Id: I73386e97fca953775f88e6f673c9bab6b9aabd06
Signed-off-by: liaohj <liaohj@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1780699
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Wanlong Zhou <zhouwl@motorola.com>
Reviewed-by: Yuesheng Huang <huangys@motorola.com>
Submit-Approved: Jira Key
The "kobject_get_path" functions can be found in the latest google
whitelist, so update the qcom whitelist for touchscreen.
Change-Id: Iddf594aa3376c3473398127439de8c42026d48cc
Signed-off-by: wengjun1 <wengjun1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1780553
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
For Pmi7150, when cabc enabled , there is backlight flicker,
under the low brightness ,the issue is caused by the accuracy
of wled accumulation.
Qcom do not recommend use cabc under the low brightness.
(CR) wled: disable cabc when bl off or bl lower than threshold
Disable cabc when bl off or bl value lower than threshold
Enable wled when bl value bigger than threshold
Port of : 9738ea6226f244dc7b97ac90226707c2c5e249cb
ce90bd688748bf7aa9e84b1e40e883456a1a2378
Change-Id: Ia8a2e1c954482f633d308a3c1f730bee15d3f0b8
Reviewed-on: https://gerrit.mot.com/1778412
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
WLED_SINK work at different mode with the different brightness.
When swithing between these modes, that will cuase ovp and ocp issue.
This is hardware issue from qcom.Qcom can not fix it with hardware
solution,So add brightness step control workaround for pfm issue.
We define the step with "qcom,wled-bl-step-sequence"
Port of: 6fa66a51e95748f92919ad7e647e13b162dbc2c4
Change-Id: Ib252f2b47819b3e358c5f995d577a5e0085c3f8f
Reviewed-on: https://gerrit.mot.com/1778397
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
When build GKI, this driver will be built as module but "__setup"
is unavailable for module, so remove it on GKI
Change-Id: Ia49f07220c2515e19bd04f78bd7ffaf4bd316d20
Reviewed-on: https://gerrit.mot.com/1779563
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
While eventpoll waking up from suspend, just very vague information gets
printed as below, which is not helpful to track wake up source:
[ 292.536658,2] last active wakeup source: eventpoll
Append process command name and PID to wake source name at registering
to make the name more informative. With this change, log would be l(CR):
[ 130.478865,2] last active wakeup source: eventpoll-healthd-905
Change-Id: I0b0d4bbb3396a11a533141e87f08f10454260411
Signed-off-by: Shiyong Li <a22381@motorola.com>
Reviewed-on: https://gerrit.mot.com/987224
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver <sltawvr@motorola.com>
Tested-by: Jira Key <jirakey@motorola.com>
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key <jirakey@motorola.com>
Signed-off-by: xuwt2 <xuwt2@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1533155
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1779323
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
