OSDN Git Service
Chalard Jean [Fri, 2 Mar 2018 13:25:02 +0000 (13:25 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am:
6001f72478 am:
e5e819f078
am:
1be320a494
Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
Chalard Jean [Fri, 2 Mar 2018 13:17:23 +0000 (13:17 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am:
6001f72478
am:
e5e819f078
Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
Chalard Jean [Fri, 2 Mar 2018 13:10:45 +0000 (13:10 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
am:
6001f72478
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
Chalard Jean [Fri, 2 Mar 2018 12:54:29 +0000 (12:54 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am:
20013384dc am:
18e51821b1
am:
207b8e2b4e
Change-Id: Ifd77149ca2c45249b8776c878c6fac46ae81c2a4
Chalard Jean [Fri, 2 Mar 2018 12:46:46 +0000 (12:46 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am:
20013384dc
am:
18e51821b1
Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871
Chalard Jean [Fri, 2 Mar 2018 12:34:25 +0000 (12:34 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
am:
20013384dc
Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
Chalard Jean [Fri, 2 Mar 2018 11:52:15 +0000 (11:52 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
Chalard Jean [Fri, 2 Mar 2018 11:18:10 +0000 (11:18 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
TreeHugger Robot [Fri, 2 Mar 2018 09:57:14 +0000 (09:57 +0000)]
Merge "Add HIDDEN_API_BLACKLIST_EXEMPTIONS to @TestApi."
Mathew Inwood [Tue, 27 Feb 2018 16:36:11 +0000 (16:36 +0000)]
Add HIDDEN_API_BLACKLIST_EXEMPTIONS to @TestApi.
It's used by a CGTS test.
Bug:
64382372
Test: It builds
Change-Id: I4bde625a89896140b2e8bf585d16074d290c0fc9
Bo Zhu [Fri, 2 Mar 2018 08:52:36 +0000 (08:52 +0000)]
Merge "Check the public-key signature of the whole certificate file before accepting the certificates"
Hyundo Moon [Fri, 2 Mar 2018 08:22:20 +0000 (08:22 +0000)]
Merge "Move MediaItem2 Builder to updatable"
Chalard Jean [Wed, 21 Feb 2018 09:43:54 +0000 (18:43 +0900)]
Give apps with NETWORK_SETTINGS right to see any VPN.
...not only the ones that apply to them.
Bug:
73217368
Test: runtest frameworks-net and CTS
Change-Id: I436972a3e51e98bdd815771b451bcedadf684763
Chalard Jean [Mon, 26 Feb 2018 02:52:46 +0000 (11:52 +0900)]
Give VPNs the INTERNET capability when they route most of the IP space
Test: manual, plus wrote some new tests for this
Bug:
72765718
Change-Id: I9759da72b752fd8eeb1d0647db9ab341f04c0528
TreeHugger Robot [Fri, 2 Mar 2018 06:20:24 +0000 (06:20 +0000)]
Merge "MediaMetadata2: Supplement Javadoc of each key"
Hall Liu [Fri, 2 Mar 2018 02:43:46 +0000 (02:43 +0000)]
Merge "Remove cell info from legacy apps without location on" am:
6b0e7370e2 am:
1c1b58432b
am:
85f47b72b8
Change-Id: I4bb4fcb6549772ced86030d0ed8cdc3d0ef0eacc
Hall Liu [Fri, 2 Mar 2018 02:29:06 +0000 (02:29 +0000)]
Merge "Remove cell info from legacy apps without location on" am:
6b0e7370e2
am:
1c1b58432b
Change-Id: I0b6e2889788123f7b73de697098f44e324587477
Hall Liu [Fri, 2 Mar 2018 02:18:16 +0000 (02:18 +0000)]
Merge "Remove cell info from legacy apps without location on"
am:
6b0e7370e2
Change-Id: I6f0b5391b7a49232fc8bebd38047af0d77e333e1
Chavi Weingarten [Fri, 2 Mar 2018 01:39:23 +0000 (01:39 +0000)]
Merge "Fixed incorrect annotation Flaky to FlakyTest"
chaviw [Fri, 2 Mar 2018 01:29:21 +0000 (17:29 -0800)]
Fixed incorrect annotation Flaky to FlakyTest
Also marked WindowConfigurationTests as flaky
Bug:
74078662
Change-Id: I9902fc566f348b63cb5b2fdf04954ea9b031440d
Test: Self
Rajeev Kumar [Fri, 2 Mar 2018 01:09:02 +0000 (01:09 +0000)]
Merge "Create a pushed atom that gets logged when the ActivityManagerService detects that an app died."
Hall Liu [Fri, 2 Mar 2018 00:49:33 +0000 (00:49 +0000)]
Merge "Remove cell info from legacy apps without location on"
Wale Ogunwale [Fri, 2 Mar 2018 00:17:40 +0000 (00:17 +0000)]
Merge "Mark wm tests as flaky"
TreeHugger Robot [Fri, 2 Mar 2018 00:03:38 +0000 (00:03 +0000)]
Merge "Attempts to optimistically bind to AIA resolver"
TreeHugger Robot [Thu, 1 Mar 2018 23:51:26 +0000 (23:51 +0000)]
Merge "Pass forward listeners when using existing builder"
chaviw [Thu, 1 Mar 2018 23:47:56 +0000 (15:47 -0800)]
Mark wm tests as flaky
Bug:
74078662
Test: self
Change-Id: I286cde4d5f00591a049c3d972436e81ed815c36c
Jack Yu [Thu, 1 Mar 2018 21:44:15 +0000 (21:44 +0000)]
Merge "Added indication update mode support" am:
03664c94ae am:
3ab2a5bced
am:
1b7ce444f2 -s ours
Change-Id: I0b5382db36999e65f56b738acb92c4e24dd7e076
Ajay Panicker [Thu, 1 Mar 2018 21:35:34 +0000 (21:35 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume" am:
2cd2a6aef0 am:
ad2f9017ad
am:
d8185da227
Change-Id: Id99f889cb15789f36bc2c9c57ebdc58f730eb800
Jack Yu [Thu, 1 Mar 2018 21:34:24 +0000 (21:34 +0000)]
Merge "Added indication update mode support" am:
03664c94ae
am:
3ab2a5bced
Change-Id: I82fc7c5e7b439dd202c48dddbb1e788612aa613c
Rajeev Kumar [Thu, 1 Mar 2018 20:18:26 +0000 (12:18 -0800)]
Create a pushed atom that gets logged when the ActivityManagerService detects that an app died.
Test: Manual
Bug:
73660232
Change-Id: I8e1fda35deb1e6876da0b6638fefea9f1b92b641
Ajay Panicker [Thu, 1 Mar 2018 21:27:16 +0000 (21:27 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume" am:
2cd2a6aef0
am:
ad2f9017ad
Change-Id: I2526a89c6f366a77dbbeb0b3310438cbef2af857
Jack Yu [Thu, 1 Mar 2018 21:26:34 +0000 (21:26 +0000)]
Merge "Added indication update mode support"
am:
03664c94ae
Change-Id: I17685418cc44e78e3bdbd69d68591efe7d2922e5
Doris Liu [Thu, 1 Mar 2018 21:21:02 +0000 (21:21 +0000)]
Merge "Recommend res/animator/ for animator style res in AVD"
Ajay Panicker [Thu, 1 Mar 2018 21:15:29 +0000 (21:15 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume"
am:
2cd2a6aef0
Change-Id: I133d1167c01d6f8433bdc63fba21f113e8098d8e
TreeHugger Robot [Thu, 1 Mar 2018 20:57:31 +0000 (20:57 +0000)]
Merge "BatteryStats: Add synchronization to BluetoothStats"
TreeHugger Robot [Thu, 1 Mar 2018 20:42:35 +0000 (20:42 +0000)]
Merge "WebView: add @NonNull annotation to API"
Jack Yu [Thu, 1 Mar 2018 20:04:29 +0000 (20:04 +0000)]
Merge "Added indication update mode support"
Treehugger Robot [Thu, 1 Mar 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume"
Scott Main [Thu, 1 Mar 2018 19:37:38 +0000 (19:37 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev am:
e3c0216f95
am:
91ca55c174
Change-Id: I04555e22ddd6a26904e0c83d1113d67ff13e69a2
Doris Liu [Thu, 1 Mar 2018 19:11:44 +0000 (11:11 -0800)]
Recommend res/animator/ for animator style res in AVD
BUG:
74074384
Test: Visual inspection
Change-Id: Ifd268efd85124c7597b5b135a3dbe13d009dc917
Leif Wilden [Thu, 1 Mar 2018 19:23:31 +0000 (19:23 +0000)]
Merge "Update javadoc for SearchManager api on TV."
Scott Main [Thu, 1 Mar 2018 19:21:50 +0000 (19:21 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev
am:
e3c0216f95
Change-Id: I535787ff921cb6e6978e57dd775e7446f67195f8
Jiuyu Sun [Thu, 1 Mar 2018 19:21:32 +0000 (19:21 +0000)]
Merge "Add result code for eUICC card not found."
Ajay Panicker [Wed, 28 Feb 2018 19:36:07 +0000 (11:36 -0800)]
Bluetooth: Remove adjustAvrcpAbsoluteVolume
The AudioManager now handles all calculations for volume stepping now
and no longer uses adjustAvrcpAbsoluteVolume.
Bug:
68812037
Test: Compile
Change-Id: I9cbf7989e49738c7a43fe3142aced5803111271e
Scott Main [Thu, 1 Mar 2018 19:04:08 +0000 (19:04 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev
Scott Main [Tue, 19 Dec 2017 21:43:45 +0000 (13:43 -0800)]
Enable new yaml file for reference nav that lists all framework files.
This depends on DocLava changes in ag/
3382461
bug: b/
69845924
test: make ds-docs
Change-Id: I4acd2c2034581b349ab4c00cbfe195ee5eca2354
TreeHugger Robot [Thu, 1 Mar 2018 18:50:18 +0000 (18:50 +0000)]
Merge "cas: explicitly define possible key id values"
Jack Yu [Tue, 27 Feb 2018 23:15:14 +0000 (15:15 -0800)]
Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.
Test: Manual
Bug:
65112388
Merged-In: I4bb4894eaaba401f655e5dc25138275f5e8498e1
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
(cherry picked from commit
1a1c35750b2612e040c9392b4d0d6f4e1a2b3b8a)
Jeff Sharkey [Thu, 1 Mar 2018 18:04:16 +0000 (18:04 +0000)]
Merge "Force loading of safe labels in system_server."
TreeHugger Robot [Thu, 1 Mar 2018 17:57:21 +0000 (17:57 +0000)]
Merge "TURN OFF -> Turn off"
TreeHugger Robot [Thu, 1 Mar 2018 17:52:24 +0000 (17:52 +0000)]
Merge "Use non-condensed font for QS labels"
TreeHugger Robot [Thu, 1 Mar 2018 17:31:40 +0000 (17:31 +0000)]
Merge "Sanity check to avoice NPE if an app-provided URI is invalid."
TreeHugger Robot [Thu, 1 Mar 2018 17:30:33 +0000 (17:30 +0000)]
Merge "Removed AMS.updatePersistableUriPermission()"
TreeHugger Robot [Thu, 1 Mar 2018 17:27:26 +0000 (17:27 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGING to secondary users too"
Arthur Ishiguro [Thu, 1 Mar 2018 17:10:14 +0000 (17:10 +0000)]
Merge "Mark location classes as Parcelable appropriately"
TreeHugger Robot [Thu, 1 Mar 2018 16:56:31 +0000 (16:56 +0000)]
Merge "Only animate drag handle alpha, not translation."
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:55:45 +0000 (16:55 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit." am:
093c509c40 am:
031b91574d
am:
54ebb3e0b7
Change-Id: Ie218259d09539ec004ccf9fca88133227323d6e2
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:43:31 +0000 (16:43 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit." am:
093c509c40
am:
031b91574d
Change-Id: I50385cb665a557baad8b271bcfd4431072db7592
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:37:13 +0000 (16:37 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
am:
093c509c40
Change-Id: I562562c1abc3a5a64820ca5eaa244f00a75c4200
Bryce Lee [Thu, 1 Mar 2018 16:33:54 +0000 (16:33 +0000)]
Merge "Add temporary logging for state transitions."
Amin Shaikh [Thu, 1 Mar 2018 16:31:09 +0000 (11:31 -0500)]
TURN OFF -> Turn off
Bug:
72549790
Test: visual
Change-Id: I756c7893a00ec701c8112e878bbcb2b7b0d0319e
Chavi Weingarten [Thu, 1 Mar 2018 16:28:32 +0000 (16:28 +0000)]
Merge "Use destroy in transaction for animation"
Evan Laird [Thu, 1 Mar 2018 16:13:58 +0000 (11:13 -0500)]
Use non-condensed font for QS labels
Test: visual
Change-Id: Iab2f2ff09a5c62f86730b90aa47f9cb2179ce2e5
Fixes:
74022469
TreeHugger Robot [Thu, 1 Mar 2018 15:11:16 +0000 (15:11 +0000)]
Merge "Remove calls to setAccount and getAccount in test"
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 15:11:14 +0000 (15:11 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
Patrick Baumann [Wed, 28 Feb 2018 22:08:29 +0000 (14:08 -0800)]
Attempts to optimistically bind to AIA resolver
To avoid the first resolve of an Instant App needing to bind to the
Instant App resolver during resolution, we attempt to bind soon after
device boot and subsequently whenever the resolver connection dies (such
as on app kill on upgrade).
Bug:
73771940
Test: manual - attempt resolve soon after boot and observe successful resolve
Test: manual - force-stop com.google.android.gms and observe rebind
Change-Id: Iba13cafd98e3477b1b1fe0288ea83f90dd399aba
Amin Shaikh [Thu, 1 Mar 2018 14:03:52 +0000 (09:03 -0500)]
Only animate drag handle alpha, not translation.
Bug:
73312177
Test: visual
Change-Id: I47f1bc0f0bf72a73c3e42c5cdd7df3c22218f7aa
Adrian Roos [Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)]
Merge "DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode"
Robert Berry [Thu, 1 Mar 2018 13:21:07 +0000 (13:21 +0000)]
Remove calls to setAccount and getAccount in test
This param is now deprecated.
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: I318edba915cb15280b884181ae868b4b07a35098
Android Build Merger (Role) [Thu, 1 Mar 2018 12:06:09 +0000 (12:06 +0000)]
Merge "Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
c164c83191 am:
9ee9e6b2b6 am:
09ad1cbdc0 -s ours"
Anton Hansson [Thu, 1 Mar 2018 12:05:36 +0000 (12:05 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
c164c83191 am:
9ee9e6b2b6
am:
09ad1cbdc0 -s ours
Change-Id: Ie6a6e4241fbf4b614fa0683419e58969559992fe
TreeHugger Robot [Thu, 1 Mar 2018 12:03:29 +0000 (12:03 +0000)]
Merge "lowRamDevice TVs can have multi-user"
Anton Hansson [Thu, 1 Mar 2018 11:53:43 +0000 (11:53 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
c164c83191
am:
9ee9e6b2b6
Change-Id: I984b5ee633078401769d3c649aa9b020715772df
Anton Hansson [Thu, 1 Mar 2018 11:46:29 +0000 (11:46 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am:
c164c83191
Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f
Clara Bayarri [Thu, 1 Mar 2018 10:44:41 +0000 (10:44 +0000)]
Merge "Revert "Complete [add|remove]OnSessionTokensChangedListener""
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 10:35:57 +0000 (10:35 +0000)]
Tweak DateFormat.is24HourFormat javadoc to be more explicit.
Bug:
32761394
Test: make docs
Change-Id: If10da5b9d63e6e88774e333d5c266e423e6bc7c8
Anton Hansson [Thu, 1 Mar 2018 10:25:12 +0000 (10:25 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
Esteban Talavera [Thu, 1 Mar 2018 10:13:34 +0000 (10:13 +0000)]
Revert "Complete [add|remove]OnSessionTokensChangedListener"
This reverts commit
86c7d721630ce0c6f4e4069e779e32d591a394c9.
Reason for revert: Broke several targets on git_master
Change-Id: I0876582b5211db90e25897690d57de6b179a50c5
Benjamin Franz [Thu, 1 Mar 2018 09:30:12 +0000 (09:30 +0000)]
Merge "Update javadoc for DISALLOW_SYSTEM_ERROR_DIALOGS"
Nate Fischer [Thu, 1 Mar 2018 08:55:35 +0000 (00:55 -0800)]
WebView: add @NonNull annotation to API
No change to logic, only an annotation change.
startSafeBrowsing() should never receive a null Context. This adds
@NonNull to hint to developers not to pass null Contexts.
Test: N/A
Change-Id: I46d863047bf7563ea2a1adf592f3f381be95ca49
Christofer Ã…kersten [Thu, 1 Mar 2018 07:54:03 +0000 (07:54 +0000)]
Merge "Complete [add|remove]OnSessionTokensChangedListener"
TreeHugger Robot [Thu, 1 Mar 2018 07:28:35 +0000 (07:28 +0000)]
Merge "MediaPlayer2: clean up APIs"
Jean-Michel Trivi [Thu, 1 Mar 2018 07:00:39 +0000 (07:00 +0000)]
Merge "AudioPolicy: support for add/remove AudioMix without unregistering"
Abodunrinwa Toki [Thu, 1 Mar 2018 06:38:24 +0000 (06:38 +0000)]
Merge "Add TCM.getTextClassifier(int type)"
Chalard Jean [Thu, 1 Mar 2018 06:13:04 +0000 (06:13 +0000)]
Merge "Fix up NetworkCapabilities' toString" am:
7959e70ef2 am:
773523a667
am:
669194a830
Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0
Eric Schwarzenbach [Thu, 1 Mar 2018 05:57:20 +0000 (05:57 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up." am:
44d13875ff am:
c870528371
am:
7771e91a99
Change-Id: Ia0a69386981e2984472e9153c161cca7bfccc9dd
Chalard Jean [Thu, 1 Mar 2018 05:56:33 +0000 (05:56 +0000)]
Merge "Fix up NetworkCapabilities' toString" am:
7959e70ef2
am:
773523a667
Change-Id: I2f1578589232c49574dbf401d7f4becfa350a1c0
Chalard Jean [Thu, 1 Mar 2018 05:48:14 +0000 (05:48 +0000)]
Merge "Fix up NetworkCapabilities' toString"
am:
7959e70ef2
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
Eric Schwarzenbach [Thu, 1 Mar 2018 05:47:20 +0000 (05:47 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up." am:
44d13875ff
am:
c870528371
Change-Id: I2b57a55e8bb36ba24578c00e2afaebfc21e0e4c3
Eric Schwarzenbach [Thu, 1 Mar 2018 05:38:49 +0000 (05:38 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
am:
44d13875ff
Change-Id: I37f039ea44114b48b44bce7174deb3d55b2667fc
Makoto Onuki [Thu, 1 Mar 2018 05:35:49 +0000 (05:35 +0000)]
Merge "Fix "app doesn't support backup and restore" bug"
TreeHugger Robot [Thu, 1 Mar 2018 05:11:24 +0000 (05:11 +0000)]
Merge "MediaSession2: Unhide setAudioFocusRequest"
Jean-Michel Trivi [Wed, 14 Feb 2018 16:57:46 +0000 (08:57 -0800)]
AudioPolicy: support for add/remove AudioMix without unregistering
System API for a registered AudioPolicy to attach or detach
AudioMix without having to unregister, and then registering
the new mix configuration.
Bug:
63906162
Test: AudioPolicyTest
Change-Id: Ib2fea8aa034d3f7b498e76dc1fc51c1ea508d3a2
TreeHugger Robot [Thu, 1 Mar 2018 04:21:25 +0000 (04:21 +0000)]
Merge "Remove RemoteSurfaceTrace functionality."
Chalard Jean [Thu, 1 Mar 2018 04:01:16 +0000 (04:01 +0000)]
Merge "Fix up NetworkCapabilities' toString"
Wei Jia [Fri, 23 Feb 2018 17:16:08 +0000 (09:16 -0800)]
MediaPlayer2: clean up APIs
Make MediaPlayer2 derived from MediaPlayerBase
Test: MediaPlayer2 plays
Bug:
63934228
Change-Id: Ib31e3196ad65c694f778a8a79277e53017a7026f
Treehugger Robot [Thu, 1 Mar 2018 03:48:32 +0000 (03:48 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
TreeHugger Robot [Thu, 1 Mar 2018 03:39:31 +0000 (03:39 +0000)]
Merge "MediaSession2: Refine APIs"
Sungsoo Lim [Thu, 1 Mar 2018 00:08:40 +0000 (09:08 +0900)]
MediaSession2: Unhide setAudioFocusRequest
Bug:
64098437
Test: make update-api
Change-Id: I9244719e1a771ab7b420a95af6ba43faef7b352c
Arthur Ishiguro [Wed, 28 Feb 2018 19:27:50 +0000 (11:27 -0800)]
Mark location classes as Parcelable appropriately
Doesn't add the "final" qualifier,
since make will throw errors due to compatibility issues.
Bug:
69622177
Test: Run CHQTS from master and oc-mr1-dev, verify pass
Change-Id: If02203d7862e77ca4fda7b95a39bbfa3d9f6d87d