summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2024-12-09Royal Ricefish: Prepare RR 18.0.3ricefish_18.0.3ricefish/18.0.318.0.3ricefishJan-Simon Moeller1-0/+104
Add the repo manifest. Bug-AGL: SPEC-5320 Change-Id: I3291983717c39f9bf029a525e0b13b6cc5965131 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-12-05Update to YP 5.0.5Jan-Simon Moeller1-6/+6
Update to the latest YP 'scarthgap' branch release. Update dependency layers. BSP layers in separate commit. Bug-AGL: SPEC-5315 Change-Id: I8793ed56d4fd99104e72e7f879818137cf946c09 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-10-28Prepare Royal Ricefish 18.0.2ricefish_18.0.2ricefish/18.0.218.0.2Jan-Simon Moeller1-0/+104
Upload the repo manifest for 18.0.2 . Bug-AGL: SPEC-5270 Change-Id: I14cce960297fcf9bfa2e6f9f4605ea03ccc7c669 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-10-22Update to YP 5.0.4Scott Murray1-12/+12
Changes: - Update poky to YP 5.0.4 commit. - Other layers have been updated to their latest scarthgap or master branch commits as appropriate to pick up fixes. Bug-AGL: SPEC-5258 Change-Id: I3c60319a351936f580b86c324916eecdb786c80e Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit c6b3ae0a759b94291d587df0a5220d5956e77328)
2024-09-11Prepare Royal Ricefish 18.0.1ricefish_18.0.1ricefish/18.0.118.0.1Jan-Simon Moeller1-1/+1
Update meta-flutter revision. Bug-AGL: SPEC-5243 Change-Id: I03e210559fe2453f9e0e5fdc13c79e0a985ab3af Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-09-10Update meta-flutterScott Murray1-1/+1
Bump meta-flutter to pick up pub cache archive naming improvement and app config.toml installation hook. Change-Id: Ie0868248983eb21e8dbaace1264eeb1ac7c7d0e7 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 1d2946099c2ac07d29cc38e187c96d7b87c6f3bc)
2024-09-09Prepare Royal Ricefish 18.0.1Jan-Simon Moeller1-0/+104
Update the repo manifest. Bug-AGL: SPEC-5243 Change-Id: Id04970fa95762ba42280eb348185828a112c23e0 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-09-09Roll meta-flutterJoel Winarske1-2/+2
-flutter sdk 3.24.2 filament-view updates flutter-auto updates rive-common 0.4.11 -workspace-automation v2.0 virtual environment support fetches prebuilt engine artifacts for desktop-homescreen Change-Id: I59809ab96acad90dc2a4694a9efbf9b011057ce6 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> (cherry picked from commit 8fae3b42a42293ebd7a61ecad558bad82cfc04e7)
2024-09-06Update meta-rcarScott Murray1-1/+1
Update meta-rcar configuration to switch to the current HEAD of its new scarthgap-v5.9.4 branch. SPEC-5191 Change-Id: I127c1151cfc783f48fb9d168e05576bea5148992 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit c74b3874cf394f0635118d69e31ef0bbf2d84de0)
2024-08-28Update to YP 5.0.3Scott Murray1-12/+12
Changes: - Update poky to YP 5.0.3 commit. - Other layers have been updated to their latest scarthgap or master branch commits as appropriate to pick up fixes. - Note that the meta-renesas update requires fixes in both meta-agl-refhw and meta-agl. Bug-AGL: SPEC-5239 Change-Id: Ifa70f115ae62c5fdfb04523788bdeb70196dc4fe Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-07-29Update to YP 5.0.2Scott Murray1-14/+14
Changes: - Update poky to YP 5.0.2 commit. - Other layers have been updated to their latest scarthgap or master branch commits as appropriate to pick up fixes. - meta-ti and meta-riscv are slight exceptions: - meta-ti has been set to a slightly older commit as scarthgap HEAD currently breaks the BB.org machines. Upstream have been notified, and a fix will be coming soon. - meta-riscv is set to a slightly older commit due to what seems to be an accidental backport of a styhead compatibility change. Upstream have been notified. Bug-AGL: SPEC-5212 Change-Id: Iec0b85006d8a7f1d82821d451d90d134ccf0396c Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-07-09Royal Ricefish 18.0.0ricefish_18.0.0ricefish/18.0.018.0.0Jan-Simon Moeller1-0/+104
Upload the repo manifest. Bug-AGL: SPEC-5198 Change-Id: If121295911df129ada26e9d56e36e0a27be6e738 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-07-08Roll meta-flutterJoel Winarske1-1/+1
-ivi-homescreen v2.0 -common source tree between ivi-homescreen and flutter-auto. The only difference is the executable name. -unique flutter archive file name based on commit and flutter sdk version -delete pubspec.lock file by default. Overrides are available -Rive support -dart-sdk 32-bit support -sentry-native RISC-V -strip x86_64 executables in flutter-sdk package Bug-AGL: SPEC-5193 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I022a939211d316a930e99eb239b1687a39cec04c (cherry picked from commit 6aa1c04a26a0f2817b0d8b452715eaeaef35a53c)
2024-07-02Royal Ricefish Milestone 3ricefish_17.93.0ricefish/17.93.017.93.0Jan-Simon Moeller1-0/+104
Add the repo manifest. Bug-AGL: SPEC-5197 Change-Id: If2893a8cbf319d3cc5cb9538a86aeb4f82b46f4d Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-07-01Update meta-qt6 to v6.7 branch for demo control panelJan-Simon Moeller2-1/+2
We need this revision for pyqt6 and pyside6. Bug-AGL: SPEC-5195 Change-Id: Ic437ca8a8e5d9c3289fb7e5b917767c28e0ace06 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-07-01Update manifests for Royal Ricefish branchJan-Simon Moeller2-2/+2
Change the default branch to ricefish. Bug-AGL: SPEC-5195 Change-Id: I72f7b0747bc69d91db65a6fe0799dc4e309be719 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-07-01Add gitreview file for Royal Ricefish branchJan-Simon Moeller1-1/+1
Update the .gitreview file. Bug-AGL: SPEC-5194 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I8c177478706bb7efef9070a7767d6d4b1dac9eb8
2024-06-27Add meta-tegra layerJan-Simon Moeller1-0/+3
Add the layer. Target would be the jetson-orin-agx-devkit Bug-AGL: SPEC-5176 Change-Id: I130153c40dfe4d1de5088aea7ff9aaa6f2c5ba3f Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-06-25Prepare Royal Ricefish Milestone 2ricefish_17.92.0ricefish/17.92.017.92.0Jan-Simon Moeller1-0/+101
Upload the repo manifest. Bug-AGL: SPEC-5186 Change-Id: I8c5233da1037dc53aa9b01f6dd5861ded69ee487 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-06-05Update poky to latest scarthgapScott Murray1-1/+1
Update poky to latest scarthgap to get the backported ptest-runner upgrade that we need to handle to keep meta-agl-core testing on the YP AB working. Bug-AGL: SPEC-5167 Change-Id: I19cce59f5332a77ca828d982711dafeb37ce6a38 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-06-05Switch to meta-raspberrypi scarthgap branchScott Murray2-2/+2
Switch meta-raspberrypi to its scarthgap branch now that it is available. Bug-AGL: SPEC-5164 Change-Id: I9c78111ce9bade0f2c080468f51cf90037a7fd75 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-06-04Prepare Royal Ricefish Milestone 1ricefish_17.91.0ricefish/17.91.017.91.0Jan-Simon Moeller1-0/+101
Add the repo manifest. Bug-AGL: SPEC-5154 Change-Id: Ib58d9c44796bbe2e390a759628cf82fa7d43955f Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-06-04Pull down meta-qt6 layerJan-Simon Moeller1-0/+2
Add meta-qt6 from lts-6.5 branch to stack. This allows porting the QT apps and the demo control panel. Bug-AGL: SPEC-5163 Change-Id: I7143bfa84c4e82877eb8764d9fcaf5b45d7307b9 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-05-27Update to YP 5.0.1Scott Murray2-16/+16
Changes: - Update poky to YP 5.0.1 commit. - Switch meta-qt5, meta-aws, meta-arm, and meta-riscv to latest commit of their scarthgap branches now that the branch is available. - Other layers have been updated to their latest scarthgap or master branch commits as appropriate to pick up fixes. Bug-AGL: SPEC-5149 Change-Id: Id83a05f6203db228055f6455b3fc792375e0f785 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-04-26Update to YP 5.0 aka scarthgapScott Murray2-45/+51
Update default manifests with repository configurations from 'next' branch to switch to the upstream 5.0 / scarthgap compatible branches. This aligns us with the final 5.0 release that should happen soon. Bug-AGL: SPEC-4578 Change-Id: I7d53788d1ca363b7bc9e6ce574220e694c268711 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-03-26Update meta-flutter & workspace-automationJoel Winarske1-2/+2
-meta-flutter https://github.com/meta-flutter/meta-flutter/blob/kirkstone/CHANGELOG.md ** breaking change ** layer renamed to flutter-layer and flutter-apps-layer -workspace automation https://github.com/meta-flutter/workspace-automation/blob/main/CHANGELOG.md Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I62559a7cd978614b32c829b4c0d770041b4bc6d4
2024-03-25Update Renesas BSP to the latest KirkstoneAnh Nguyen1-1/+1
Bug-AGL: SPEC-5069 Change-Id: I4ae75eeae1c50a11be84512846903eb7147143f6 Signed-off-by: Anh Nguyen <anh.nguyen.pv@renesas.com>
2024-03-19Switch Rust mixin layer branchScott Murray2-2/+2
Switch to the non-version-specific kirkstone/rust branch in the meta-lts-mixins repository to pick up Rust 1.75. Bug-AGL: SPEC-5070 Change-Id: I873ae560ff27a77b77e848d4b6fea3d5290ee88b Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-03-19Remove meta-python2Scott Murray2-6/+0
We no longer need meta-python2 to build anything, and Python 2.x is EOL, so remove it to avoid confusion and ease the upgrade to YP 5.0 / scarthgap. Bug-AGL: SPEC-5099 Change-Id: Ib4cd6422e41e6d257c06613e32d4a9745e3f60be Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-02-24Update public BSPs to the latest KirkstoneDenys Dmytriyenko1-3/+3
Bump following layers to their latest commits: * meta-freescale * meta-ti * meta-raspberrypi Re-test the affected platform: * imx8mq-evk * beaglebone/bbe * j721e-evm * raspberrypi4 Bug-AGL: SPEC-5069 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I76fad4c6955184dcd6f46d07303278d3182e69b0
2024-02-24Update to YP 4.0.16Denys Dmytriyenko1-4/+4
* Update poky to the yocto-4.0.16 revision. * Also uprev the following layers: ** meta-openembedded ** meta-virtualization ** meta-qt5 Basic testing has been performed on these platforms: * qemux86-64 * qemuarm/qemuarm64 * h3ulcb * raspberrypi4 * beaglebone/bbe * imx8mq-evk Bug-AGL: SPEC-5069 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I460f094a4df1e7c85444b3193162701e46cd520c
2024-02-13Add gitlab issue/merge request templatesricefish_17.90.0ricefish/17.90.017.90.0Jan-Simon Moeller2-1/+3
Add template files for gitlab Bug-AGL: SPEC-4474 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I15e8ff9bfe6f500925240b0e2cccfb90cfaef080
2024-02-09Update Quirky Quillback Milestone 3 manifestquillback_16.93.0quillback/16.93.016.93.0Jan-Simon Moeller1-1/+1
This adds the new rust layer to the manifest of QQ M3. Bug-AGL: SPEC-5059 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I690d447389c07da9e25d4b07bff24984ae2ffde4
2024-02-02Update Rust mixin layerScott Murray2-2/+2
Switch from kirkstone/rust-1.68 branch in meta-lts-mixin to new kirkstone/rust-1.70 branch to future proof building the KUKSA.val databroker and the various vhost device backends. The target directory in external has been changed to drop the version number so that the configuration template will not need to be changed again if for some reason we do need to do another bump. Bug-AGL: SPEC-5060 Change-Id: Id3d6c3556bb1fc3dc0aad2db4ab35b44b5bbe571 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2024-01-30Prepare Quirky Quillback Milestone 3Jan-Simon Moeller1-0/+98
Add the repo manifest for Quirky Quillback Milestone 3. Bug-AGL: SPEC-5059 Change-Id: Id6fae7f8e308f1e4cc69fccc12e6897f5f4772bd Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-01-05Update public BSPs to the latest KirkstoneDenys Dmytriyenko1-3/+3
Bump following layers to their latest commits: * meta-freescale * meta-freescale-3rdparty * meta-ti Re-test the affected platform: * imx8mq-evk * beaglebone/bbe * j721e-evm Bug-AGL: SPEC-5036 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I8dddadadd82621b1041144fe8314b03b91fdaff3
2024-01-05Update to YP 4.0.15Denys Dmytriyenko1-4/+4
* Update poky to the yocto-4.0.15 revision. * Also uprev the following layers: ** meta-openembedded ** meta-virtualization ** meta-clang Basic testing has been performed on these platforms: * qemux86-64 * qemuarm/qemuarm64 * h3ulcb * raspberrypi4 * beaglebone/bbe * imx8mq-evk Bug-AGL: SPEC-5036 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I007d372f5eae4cbd64d4ea7df52a31ec975ca459
2023-12-18Prepare Quirky Quillback Milestone 2quillback_16.92.0quillback/16.92.016.92.0Jan-Simon Moeller1-0/+98
Update the repo manifest. Bug-AGL: SPEC-5021 Change-Id: I9af0380a177f9dd3d4e22eaeae3795769b4ed912 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-12-13Update meta-ti BSP with major BeagleBoard.org updatesDenys Dmytriyenko1-1/+1
BeagleBoard.org platforms support in meta-ti BSP has been updated to the latest Linux kernel 6.1 and U-boot 2023.04 with binman FW support. There are still few minor issues being looked at, but overall the BSP is getting ready to be utilized in AGL. Bug-AGL: SPEC-4941 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I5ffa8799e6c5b6f1be95774edc9670c5c0b29805
2023-12-11Update to YP 4.0.14Denys Dmytriyenko1-6/+6
* Update poky to the yocto-4.0.14 revision. * Also uprev the following layers: ** meta-openembedded ** meta-virtualization ** meta-qt5 ** meta-clang Minor BSP changes to meta-freescale Basic testing has been performed on these platforms: * qemux86-64 * qemuarm/qemuarm64 * h3ulcb * raspberrypi4 * beaglebone/bbe * imx8mq-evk Bug-AGL: SPEC-4992 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I2bd4d1e3e3e4143b96adc54764e4a718189f2187
2023-12-08Add meta-aws to repo manifest to enable AMI generationJan-Simon Moeller2-0/+9
We prepare generating AMI images. For this we need the meta-aws layer. v2: Add layer as bsp (as it contains a machine) Bug-AGL: SPEC-5006 Change-Id: Idbd41da14f148c2cda1af0bb95cb17e836f97302 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-11-21Prepare Quirky Quillback Milestone 1quillback_16.91.1quillback_16.91.0quillback/16.91.1quillback/16.91.016.91.116.91.0Jan-Simon Moeller1-0/+95
Upload the repo manifest. Bug-AGL: SPEC-4978 Change-Id: I6b5186a14019762f7e4cdbddc826a0f8994b4c7a Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-11-10Roll meta-flutter/workspace-automationJoel Winarske1-2/+2
-workspace-automation create_aot.py tool version_files.py tool pubspec.py tool -meta-flutter remove pyyaml dependency roll version files update engine_sdk.zip contents Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: Iff051201273139a10f996f6ed12975e741e68858
2023-11-04Roll meta-flutter and workspace-automationJoel Winarske1-2/+2
meta-flutter -dart_plugin_registrant work * dart plugin registrant called in all cases with --obfuscate enabled * default --obfuscate for gen_snapshot * make flutter app do_compile() easier to read * validate pubspec name against selected * default strip and obfuscate to gen_snapshot step obfuscate appears to resolve the issue with gallery not registering plugins it might be that obfuscate preserves the correct entry point * move flutter-app.inc to the include folder workspace-automation changes -default 3.13.9 -pubspec-path option (enables parsing federated plugins) -plugin-platform option (enables filtering federated plugins) -use engine archive instead of local build Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I5c869badea8658a6c1a0ee21bbded53e5886d070
2023-11-03Roll meta-flutterJoel Winarske1-1/+1
-Flutter SDK 3.13.9 -ivi-homescreen/flutter-auto Update Damage area: addresses resizing to larger size EGL 1.4 compatibility (Renesas) file-selector plugin support google-sign-in plugin updates egl config multisample build option warn-as-error fixes -AOT generation now includes dart_plugin_registrant.dart fixes: meta-flutter issue #115 -dart_plugin_registrant.dart is filtered for unused platforms -path_provider is dependent on xdg-user-dirs if you want official xdg directories, otherwise methods return home path. For apps that are dependent on xdg-user-dirs add xdg-user-dirs to your RDEPENDS, and run `xdg-user-dirs-update` on birthday boot from user that runs homescreen/flutter-auto. -ivi-homescreen/flutter-auto known working apps included in meta-flutter * flutter_markdown_example * google_maps_flutter_example runs - not plumbed into proprietary module * path_provider_example run xdg-user-dirs-update same user as the homescreen/flutter-auto runs as * animated_background_example * gallery * go_router_examples * google_sign_in_example * extension_google_sign_in_example * shared_preferences_example * file_selector_example runs, and zenity starts works on desktop homescreen/flutter-auto For AGL app activation code needed * url_launcher_example url launch works, webview launch/close not wired in For AGL app activation code needed * camera_example runs, does not talk to flutter-auto * wonders does not display anything shared_preference plugin issue - needs investigation appears to be pigeon related * in_app_purchase_example does not display anything appears to be pigeon related * video_player_example runs, does not talk to homescreen/flutter-auto. Needs update to work with upstream pigeon change Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I5f465816c074d9753d3f024e71575905b26b604d
2023-10-31Update Rust mixin layerScott Murray1-1/+1
Bump meta-lts-mixins:kirkstone/rust-1.68 to latest commit to get minor fix to ignore generated Python .pyc files. Bug-AGL: SPEC-4954 Change-Id: Ia6b326973619f34911200f77bfa63abed01daad8 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-10-23Update public BSPs to the latest KirkstoneDenys Dmytriyenko1-4/+4
Bump following layers to their latest commits: * meta-freescale * meta-freescale-3rdparty * meta-ti * meta-raspberrypi Re-test the affected platform: * imx8mq-evk * beaglebone/bbe * raspberrypi4 Bug-AGL: SPEC-4926 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I76d39fa32fd3d10fbb14ea6b7ab958cf59fae2c2
2023-10-23Update to YP 4.0.13Denys Dmytriyenko1-5/+5
* Update poky to the yocto-4.0.13 revision. * Also uprev the following layers: ** meta-openembedded ** meta-virtualization ** meta-security ** meta-qt5 Basic testing has been performed on these platforms: * qemux86-64 * qemuarm/qemuarm64 * h3ulcb * raspberrypi4 * beaglebone/bbe * imx8mq-evk Bug-AGL: SPEC-4926 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: Ia06fe703c5ea8367d92d2d98ba6793170511969e
2023-10-17Roll meta-flutter & workspace-automationJoel Winarske1-2/+2
-meta-flutter Flutter 3.13.2 deprecate clang toolchain for homescreen + flutter-auto remove insane skip on depot-tools cipd fetcher implementation add impeller flags for engine build ivi-homescreen/flutter-auto (only difference here is name) * Unit Tests * spdlog replaces FML_LOG * Sink Logging messages from libnav_render.so * Handle case when Flutter engine passes present_with_info invalid * Sway/tinywl support * sentry native support * wayland event mask * ivi-shell support * navi interface 2 * misc plugin support for latest gallery * Flickering Fix * Wayland release key when focus changes * Build Option for EGL 3D Config * GL Resolver changes * Google Sign In support * Coalesce Touch and Mouse events * Navi Texture RenderBuffer * Navi support single threaded executor * ASIO for TaskRunner * misc null guards * compiler flags adjustments * No-op handling for SystemSound.play * Navi Texture Dispose Fix * DLT logging * Handle SystemChrome.setEnabledSystemUIMode * Dirty Region Management * Logging Plugin -workspace-automation * mask_rom flash option * fastboot support * package detection update for Ubuntu * Handle relative paths for docker * Impeller flag support * Builds engine locally by default * 3.13.2 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I3f4e2c4b2026cb7d8e6f0929f6f3c835991dbfdd
2023-10-11Add meta-tensorflow layer to externalMalik Talha2-0/+6
Tensorflow is required by the RASA framework which is used for voice/speech recognition tasks. Bug-AGL: SPEC-4856 Signed-off-by: Malik Talha <talhamalik727x@gmail.com> Change-Id: Ibec998d8ca687a324b1b55cd3b22ef532156dfc4