Commit graph

4305 commits

Author SHA1 Message Date
Iris Chang
349de81afa VTS: fix VtsHalKeymasterV3_0Target issue
am: af5fad4036

Change-Id: I139f6a801391577bd9919f31fb62d1f3aaf97462
2018-01-23 22:49:00 +00:00
Kevin Rocard
c78afae8ee Audio VTS: do not test duplicate policy configuration file
am: 68d4dd6e85  -s ours

Change-Id: I96d3e1eb279b4cc9f7109088841a7ed06d91ff16
2018-01-23 22:46:17 +00:00
Kevin Rocard
74601ebc0e Audio VTS: remove expectation of policy configuration unicity
am: 9c4e363a70  -s ours

Change-Id: I3a45eb83b856afb933b3b6e0ee6b20d27b16a314
2018-01-23 22:44:16 +00:00
Kevin Rocard
b9cd8a6512 Allow partially dynamic profile in the audio policy config
am: e54b381d9d  -s ours

Change-Id: Ifb61d1c43421127151ea3da6765a7485779e9536
2018-01-23 22:43:14 +00:00
Ram Mohan M
368589ea3d bug fix: restore support for broken flag
am: 8d009afdbb  -s ours

Change-Id: I722a103539af432e07daf6303baadc9bad27521c
2018-01-23 22:42:19 +00:00
Ram Mohan M
e1a544dcbd bug fix: handle multiple port settings change events signalled at once
am: 0a542276f8  -s ours

Change-Id: Iba54b734ed7db87801d49d568a8d127ee9d1da74
2018-01-23 22:40:36 +00:00
Kevin Rocard
e27e897c14 Merge "Audio VTS: Look for Audio policy config in all supported folders" into oreo-vts-dev
am: 5e74540849  -s ours

Change-Id: If8b360a55a9919804098690132ae784c2487642d
2018-01-23 22:38:03 +00:00
Shawn Willden
96e3ce2be9 Merge "Don't send more than 2K to addRngEntropy" into oreo-vts-dev
am: b461eafa23  -s ours

Change-Id: I0132541fbbd292f1c0c8e4d4461671b3c7983f39
2018-01-23 22:36:51 +00:00
Ram Mohan M
3daee142d1 bug fix: disable timestamp deviation test for audio decoder
am: c4e3cc8b51  -s ours

Change-Id: I64e1e95d84d500ce6742ad1df012c4ebf0b8fd75
2018-01-23 22:35:57 +00:00
Jeff Tinker
6790aafb8e Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev
am: d5c6411aeb  -s ours

Change-Id: Ia8f537e7c016e761737d0203476c50ed35368b13
2018-01-23 22:35:00 +00:00
Ram Mohan M
53189885dc bug fix: output colorformat configuration fixed
am: 56906949cc  -s ours

Change-Id: Ia3eb83ce9081c728f82030635f77e5765678ba47
2018-01-23 22:34:02 +00:00
Ram Mohan M
a72601c004 Merge "bug fix: configure input port buffer size" into oreo-vts-dev
am: ccc3c36c88  -s ours

Change-Id: If260ff1f14213b1385adc6972c92864ab46cad87
2018-01-23 22:33:07 +00:00
Tomasz Wasilczyk
9744916435 Update broadcastradio HAL 1.0 VTS tests.
am: aab4a1a574  -s ours

Change-Id: If08158895488e52ce773526beebfa47270d32b0e
2018-01-23 22:32:21 +00:00
Ram Mohan M
9fb681b7a1 bug fix: handle OMX_EventBufferFlag events
am: 7409a9312d  -s ours

Change-Id: Iac466c1449cce26cc9030ab0e2d3c064fb4e6d1c
2018-01-23 22:31:43 +00:00
Iris Chang
af5fad4036 VTS: fix VtsHalKeymasterV3_0Target issue
Failed cases:
AttestationTest.RsaAttestation
AttestationTest.EcAttestation

Analysis:
The verify_attestation_record() in Keymaster_hidl_hal_test.cpp calls
parse_attestation_record() to set the value of att_challenge. It fails
to compare att_challenge with challenge by memcmp.
Because setToExternal() method uses buffer pointer to local variable
(record), not use memcpy to copy into itself buffer in
parse_attestation_record(). When it leaves the parse_attestation_record(),
we will get the att_challenge which is null buffer to compare with challenge
incorrectly.

Fix: use memcpy to copy the buffer.

Bug: 65039571
Test: build passed. VtsHalKeymasterV3_0Target -> PASSED: 106, FAILED: 0.
Change-Id: I700a9242cc9a5f4cb196b62860823601e4088531
Merged-In: I700a9242cc9a5f4cb196b62860823601e4088531
(cherry picked from 54ca32a130)

(cherry picked from commit 926a8e7440)
2018-01-23 22:30:41 +00:00
Peng Xu
9e79c83432 Skip direct report test if sensor is not available
am: c9c4ba222b  -s ours

Change-Id: I47e938342444d4ee6141ae3a82920d6ca474acb6
2018-01-23 22:30:36 +00:00
Kevin Rocard
68d4dd6e85 Audio VTS: do not test duplicate policy configuration file
This patch only modifies the VTS tests.

O generic policy configuration fallback is incorrect
(see I2a39606cd820b5cd27a640248bf692204ec2cd71 for the fix).
Nevertheless, has no impact on products because this fallback
is only used in aosp builds and GSI.

Unfortunatly, this break the VTS test when run agains GSI.
Because it is too late to change GSI for Oc and DR,
relax the test to support current O GSI.

For P, ihis patch will not be part of VTS
and the fallback config will be fixed.

Bug: 65535343
Merged-In: I2a39606cd820b5cd27a640248bf692204ec2cd71
Test: Following script:

setup() {
    BUILD_ID=$1
    TARGET_PRODUCT=$2
    TARGET_BUILD_TYPE=${3:-userdebug}
    TARGET_ARCH=${4:-arm64}
    set +x

    echo "The following three variables can be overridden" \
         "by setting the corresponding environment variable"
    set -x
    TEST_SUITES_TARGET=${VTS_TEST_SUITES_TARGET:-test_suites_${TARGET_ARCH}}
    BASE_TARGET=${VTS_BASE_TARGET:-${TARGET_PRODUCT}-${TARGET_BUILD_TYPE}}
    AOSP_TARGET=${VTS_AOSP_TARGET:-aosp_${TARGET_ARCH}_ab-${TARGET_BUILD_TYPE}}
    set +x

    download() {
        local target=$1
        local file=$2
        test -f $file ||
            /google/data/ro/projects/android/fetch_artifact --bid $BUILD_ID --target $target $file ||
            { local r=$?; rm $file; return $r; }
    }

    echo "Downloading"
    download $TEST_SUITES_TARGET 'android-vts.zip'
    download $BASE_TARGET "${TARGET_PRODUCT}-img-${BUILD_ID}.zip"
    download $AOSP_TARGET "aosp_${TARGET_ARCH}_ab-img-${BUILD_ID}.zip"

    echo "Unzipping"
    rm -r system.img android-vts
    unzip aosp_${TARGET_ARCH}_ab-img-$BUILD_ID.zip system.img
    unzip android-vts.zip

    echo "Building vbmeta without verity"
    avbtool make_vbmeta_image --flag 2 --output vbmeta.img

    set -x
    adb reboot bootloader
    fastboot update ${TARGET_PRODUCT}-img-$BUILD_ID.zip --skip-reboot
    fastboot flash vbmeta vbmeta.img || echo "Warning: Device does not support vbmeta"
    fastboot erase system
    fastboot flash system system.img
    fastboot erase metadata
    fastboot -w
    fastboot reboot
    
    echo "Board setup"
    echo "You may now start vts-tradefed with:"
    echo '$ ANDROID_BUILD_TOP= PATH="$PWD:$PATH" vts-tradefed'
}
VTS_TEST_SUITES_TARGET=test_suites_arm64_fastbuild3d_linux setup 4327646 sailfish
 vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAudioV2_0Target -t CheckConfig.audioPolicyConfigurationValidation

Merged-In: Ibe1feed41325a3e4fb25e959bd254156348aa584
Change-Id: Ibe1feed41325a3e4fb25e959bd254156348aa584
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit ff7dcd7e4d)
2018-01-23 22:29:59 +00:00
Shawn Willden
065e4397cd Reduce max keymaster message size to 2K
am: a0b9b39647  -s ours

Change-Id: I712fffc9a246583b648b2db60de9d08c53a4c553
2018-01-23 22:29:00 +00:00
Kevin Rocard
9c4e363a70 Audio VTS: remove expectation of policy configuration unicity
The XML audio policy configuration is expected to be located in /vendor.
Additionally for AOSP builds (no vendor) and as a fallback in case of
missing vendor configuration, the system supports loading the XML from
/system.
This fallback config is not guaranty to be compatible with the phone HAL,
but probably does for a wide range of android phones
(at least for basic use cases).

In each of those cases, there is only one configuration file, either in
/vendor or /system.
As a result, the audio policy configuration VTS test was asserting that
only one audio_policy_configuration.xml could be found.
If multiple were found, one was useless and the platform integrator
should remove it.

But VTS are now run on phone with a /system partition from an AOSP
build and a /vendor partition from a device build.
In such scenario two audio policy config are now present on the device,
thus breaking the VTS expectation.

This is not a problem for the framework because it does not look for a /system
config if one was found in /vendor.

In the future, the /system XML might be removed as boards
specific config should be found in /vendor only as per treble
requirements.

Test: Compile
Bug: 65482614
Merged-In: I7cd7eb7284c0aa52782aa591411f8a9bf2a87a76
Change-Id: I7cd7eb7284c0aa52782aa591411f8a9bf2a87a76
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 76efe01bbd)
2018-01-23 22:28:39 +00:00
Ruchi Kandoi
822bef5322 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
am: 6753a9be72  -s ours

Change-Id: Ic106e45942084fdd611e1ba81aee4b5948f04fd0
2018-01-23 22:28:06 +00:00
Kevin Rocard
e54b381d9d Allow partially dynamic profile in the audio policy config
The audio policy configuration deserializer supports fully dynamic
profiles by not setting a profile in a port.
It also supports partially dynamic profile by
not setting @format, @samplingRates or @channelMasks

Nevertheless this last feature of partial dynamic profile
was mistakenly not allowed by the configuration xsd.

Bug: 63541622
Change-Id: I78f77a77a3c62bba28a7da5a0e3c8c608b5a01d9
Merged-In: I78f77a77a3c62bba28a7da5a0e3c8c608b5a01d9
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 43d25f2f26)
(cherry picked from commit 3092b31b14)
2018-01-23 22:27:22 +00:00
sqian
1474a76d2c Add EMPTY_RECORD for getDeviceIdentity
am: 40d93997b5  -s ours

Change-Id: I747e06817063b9b23e9586f48508996b9472fb55
2018-01-23 22:26:45 +00:00
Ram Mohan M
8d009afdbb bug fix: restore support for broken flag
timestampDevTest flag can be used to disable timestamp deviation
tests. The flag is not working as intended. This is corrected.

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64743270
Bug: 65166112

Merged-In: I611e96498a4677b6ccbff33c291d56eed7b48f6f
Change-Id: I611e96498a4677b6ccbff33c291d56eed7b48f6f
(cherry picked from commit dc6270ecc1)
2018-01-23 22:26:15 +00:00
Kevin Rocard
2a0a8da1cc Audio policy config xsd: add missing gains and address in ports
am: 69ad0a9c6f  -s ours

Change-Id: I95315f7ff2357919a75bb87240bdb5f31a0757c0
2018-01-23 22:25:55 +00:00
Ram Mohan M
0a542276f8 bug fix: handle multiple port settings change events signalled at once
Components can send various kinds of port settings changed events all
at once. During a full port reconfiguration this is causing problems
due to limited flexibility in the message handling design. For now,
before committing to a full port reconfiguration defer any events
waiting in the queue to be addressed to a later point.

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64468705

Merged-In: I537cdd3e7d92cdc6d54168f091d7897afe541599
Change-Id: I537cdd3e7d92cdc6d54168f091d7897afe541599
(cherry picked from commit a230bad8d4)
2018-01-23 22:25:50 +00:00
Treehugger Robot
5e74540849 Merge "Audio VTS: Look for Audio policy config in all supported folders" into oreo-vts-dev 2018-01-23 22:24:10 +00:00
Treehugger Robot
b461eafa23 Merge "Don't send more than 2K to addRngEntropy" into oreo-vts-dev 2018-01-23 22:24:08 +00:00
Ram Mohan M
c4e3cc8b51 bug fix: disable timestamp deviation test for audio decoder
Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64128634
Bug: 65166112

Merged-In: I8a08a8da7dd203cd16cbfbfd3f15e27966db711f
Change-Id: I8a08a8da7dd203cd16cbfbfd3f15e27966db711f
(cherry picked from commit eb9e25a3e2)
2018-01-23 22:23:27 +00:00
Treehugger Robot
d5c6411aeb Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev 2018-01-23 22:23:14 +00:00
Shawn Willden
7f9b29b9e2 Don't send more than 2K to addRngEntropy
Bug: 63745893
Test: VtsHalKeymasterV3_0TargetTest
Merged-In: I136920d3b62e026b22fbe06594bc40ccddc57dc3
Change-Id: I136920d3b62e026b22fbe06594bc40ccddc57dc3
(cherry picked from commit 3e1267edf0)
(cherry picked from commit 02ffb2be41)
2018-01-23 22:23:11 +00:00
Kevin Rocard
d6bcee4018 Audio VTS: Look for Audio policy config in all supported folders
audio_policy_configuration.xml can be loaded from the following places:
 - /system/etc/
 - /vendor/etc
 - /odm/etc
Nevertheless the config validation test was expecting it to be in
/vendor/etc exclusively.

This patch changes the test logic to:
 - look for the config files in all 3 folders
 - make sure the config is unique

Test: run the following script to check for regressions and test that
      invalid config make the test fail.
  (
  set -xe
  runVTS() { vts-tradefed run commandAndExit vts \
        --skip-all-system-status-check --primary-abi-only \
        --skip-preconditions --module VtsHalAudioV2_0Target \
        -t CheckConfig.audioPolicyConfigurationValidation; }

  echo "# Test valid config"
  runVTS

  echo "# Test multiple invalid match"
  adb shell touch /system/etc/audio_policy_configuration.xml
  ! runVTS
  adb shell rm /system/etc/audio_policy_configuration.xml

  echo "# Test multiple valid match"
  adb shell cp /{vendor,system}/etc/audio_policy_configuration.xml
  ! runVTS
  adb shell rm /system/etc/audio_policy_configuration.xml

  echo "# Test invalid config"
  adb shell sed -i /defaultOutputDevice/p /vendor/etc/audio_policy_configuration.xml
  ! runVTS
  adb shell sed -i '"/defaultOutputDevice/{p;N;d}"' /vendor/etc/audio_policy_configuration.xml

  echo "# Test that the test did not break the config"
  runVTS
  )

Bug: 64881365
Merged-In: I9db5e6f727d19fd654a3cc543a2aaab196682001
Change-Id: I9db5e6f727d19fd654a3cc543a2aaab196682001
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 6dcc713281)
2018-01-23 22:22:54 +00:00
Ram Mohan M
56906949cc bug fix: output colorformat configuration fixed
The eColorFormat field in OMX_PARAM_PORTDEFINITIONTYPE structure
has no effect on the component. This has to be configured from
OMX_VIDEO_PARAM_PORTFORMATTYPE. This is corrected. This color format
information is passed to graphic buffer during its allocation

Bug: 63796949

Merged-In: I51b1e59631647d1291ecfac373781ac5e5a0ffd5
Change-Id: I51b1e59631647d1291ecfac373781ac5e5a0ffd5
(cherry picked from commit 1441864f4c)
2018-01-23 22:22:39 +00:00
Treehugger Robot
ccc3c36c88 Merge "bug fix: configure input port buffer size" into oreo-vts-dev 2018-01-23 22:22:31 +00:00
Jeff Tinker
95cf540a79 Allow clearkey tests to run if no vendor modules
DRM cannot skip all tests when vendor modules are
not present. Currently even the clearkey tests are
skipping when there is no vendor lib. This can be
replicated by just pushing the DRM VTS test binary
build from master (or DR or MR) and executing the
binary without VTS. All test cases skip (including
clearkey).

This change prevents exiting when no vendor
modules are found.

Test: Push the test binary and confirm that the
clearkey tests run.

bug:64459011
Merged-In: Ic5f554d9b223d6ca4bf26f92f072254cc18f4620
Change-Id: Ic5f554d9b223d6ca4bf26f92f072254cc18f4620
(cherry picked from commit 5db2e67293)
2018-01-23 22:22:25 +00:00
Ram Mohan M
9a18ceb557 bug fix: configure input port buffer size
In video decoders, size of a single input frame (elementary-stream)
is dependent on width, height, color format, profile settings, ...
Most of this information is part of sps, pps and requires parsing.
But as the max size of the stream is known ahead, use it to configure
the input buffer size requirements

Bug: 63875287
Bug: 63796949

Merged-In: Ib760c4f55b094260a0abd120f852dcf1899df4e0
Change-Id: Ib760c4f55b094260a0abd120f852dcf1899df4e0
(cherry picked from commit 9ce313a7b3)
2018-01-23 22:22:12 +00:00
Tomasz Wasilczyk
aab4a1a574 Update broadcastradio HAL 1.0 VTS tests.
This is a cherry-pick of the following VTS changes from O MR1 to O:
 - ag/2462390: Fix Broadcast radio 1.0 VTS to not fail on
   other radio types than AM/FM.
 - ag/2477726: Make tuned field description more precise and
   fix VTS tests to obey it.
 - ag/2549733: Implement out-of-band metadata images (a test for in-band).

Additionally, it fixes config callback handling in OpenTunerTwice test.

Bug: b/64324703
Test: VTS
Change-Id: I590b9b4d927fb0cd41f92e919343b5b94ad0e246
Merged-In: I590b9b4d927fb0cd41f92e919343b5b94ad0e246
(cherry picked from commit 9e7774c3b9)
2018-01-23 22:22:02 +00:00
sqian
bfbbf84893 Merge "Add corresponding error code to fix vts test" into oreo-vts-dev
am: 91c4ebbd6f  -s ours

Change-Id: I1a16454045c617db500ba66ce082b68144f91a84
2018-01-23 22:21:58 +00:00
Ram Mohan M
7409a9312d bug fix: handle OMX_EventBufferFlag events
OMX_EventBufferFlag event is sent when the component has processed a buffer
with its EOS flag set. This event is not sent by soft omx components.
Vendor components can send this. From IOMX point of view, this event is
not sent for processing

bug:64102197
Merged-In: I3a978a885b1e4446f82f2356ae677f70ea6f8150
Change-Id: I3a978a885b1e4446f82f2356ae677f70ea6f8150
(cherry picked from commit c8df8940e1)
2018-01-23 22:21:33 +00:00
Roshan Pius
41ab08fa83 Merge "supplicant(vts): Remove start/stop framework" into oreo-vts-dev
am: d29136680b

Change-Id: Id2e18865aa2d457afe559383b75a96e0494a22c9
2018-01-23 22:21:19 +00:00
Peng Xu
c9c4ba222b Skip direct report test if sensor is not available
Skip SensorsHidlTest.*AshmemDirectReportOperation* tests if sensor
is not available on device.

Bug: 64230704
Test: compiles and test pass for a pixel device with mag sensor
      masked in hal.

Merged-In: I9bfbea6301891eaa2b272bd3d15b0e237799b5d6
Change-Id: I9bfbea6301891eaa2b272bd3d15b0e237799b5d6
(cherry picked from commit 31e5bf8d93)
2018-01-23 22:21:04 +00:00
Shawn Willden
a0b9b39647 Reduce max keymaster message size to 2K
Bug: 63745895
Test: VtsHalKeymasterV3_0TargetTest
Merged-In: I9b8c2e551f04bd2124462095f232bd08ff1f63c6
Change-Id: I9b8c2e551f04bd2124462095f232bd08ff1f63c6
(cherry picked from commit 703c242322)
2018-01-23 22:20:48 +00:00
Stanley Tng
d3bed350c0 Fixed the HCI ACL Header definitions for PB and BC Flags
am: 0bb581fb96  -s ours

Change-Id: I35e4ed11118a4cb2c3825394a9451cc79be80e46
2018-01-23 22:20:43 +00:00
Ruchi Kandoi
6753a9be72 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
Bug: 64245250
Test: run vts test
Merged-In: I4ca434fb1fb44a6278942f020ddd02b162d7f605
Change-Id: I4ca434fb1fb44a6278942f020ddd02b162d7f605
(cherry picked from commit c901276e60)
(cherry picked from commit 029633dcd0)
2018-01-23 22:20:01 +00:00
sqian
40d93997b5 Add EMPTY_RECORD for getDeviceIdentity
Remove same unit test case with arguments "","0" for:
- sendEnvelope
- sendTerminalResponseToSim
- sendEnvelopeWithStatus

Test: verified by vendor, treehuger
Bug: 62926561
Change-Id: I5f535bdfc5821275a7ea2571d411374e0d7a8822
Merged-In: I5f535bdfc5821275a7ea2571d411374e0d7a8822
(cherry picked from commit 67901bf2ce)
2018-01-23 22:19:46 +00:00
Legler Wu
15c9eac47c Update VTS tests so that Mediatek pass more VTS for O.
am: a945baae7f  -s ours

Change-Id: Ia676ebb1a327dce7ddfec0566aa66f8b2880d2dd
2018-01-23 22:19:04 +00:00
sqian
dfa0ea8c52 Add Sim absent assertion in the 1.0 setup
am: 4e81e1f726  -s ours

Change-Id: I7358c60cc43c32a24a19c6c705c91e59379a5991
2018-01-23 22:17:55 +00:00
sqian
9ed807a6c9 Fix some VTS for 2017 devices
am: 44bd0bb4f4  -s ours

Change-Id: I428132b88cc6a3da7769b2dbb7669a11203d7976
2018-01-23 22:16:55 +00:00
Connor O'Brien
547deb7528 Fix consumerir test bugs
am: 43e1c6bc55  -s ours

Change-Id: I49896cd8abef15d4bcda1653f8e38b645a48fc41
2018-01-23 22:13:47 +00:00
Emilian Peev
669c0ffdda Camera: Add support for testing partial results
am: beffc5ce19  -s ours

Change-Id: Ibf9f993406679944555e126c0ab90a9e4dd5b112
2018-01-23 22:12:55 +00:00
Kevin Rocard
69ad0a9c6f Audio policy config xsd: add missing gains and address in ports
No nexus/pixel device uses port gains and their configuration were taken
as reference for the xsd creation.

Gains in mixPort and devicePort are supported by the code and use by
oem. As a result the xsd should allow them.

For validation of this path, the xsd was run against the example xml in
the audiopolicy source. Several other misalignment were found. They will
be fix in an other patch.

The address is also an optional field that was forgotten for the same
reason.

Bug: b/63827061
Test: -noout xmllint --schema hardware/interfaces/audio/2.0/config/audio_policy_configuration.xsd frameworks/av/services/audiopolicy/config/audio_policy_configuration.xml
Test: the above command fails for some other xml node unrelated to this bug
Test: this is tracked by b/38184704
Change-Id: I8dae15eb85a6a6d43c87aa747daf92a88d3fdcc0
Merged-In: I8dae15eb85a6a6d43c87aa747daf92a88d3fdcc0
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 488beb2db1)
2018-01-23 22:12:10 +00:00