Bug: 67506682 Change-Id: I06dc3fbef96c06cbfc8619cd2d0f7aa0fa7d99d9 Signed-off-by: Sami Tolvanen <samitolvanen@google.com> (cherry picked from commit 0f98f46d9920a1aad7d10916eac4b83dbccabf42) Signed-off-by: Dan Aloni <daloni@magicleap.com> Signed-off-by: Davide Garberi <dade.garberi@gmail.com> Signed-off-by: GhostMaster69-dev <rathore6375@gmail.com>