GitLab

b/19904873

Change-Id: Ic0d13ee7513731706bc0f9fde8502acba0899cb3
Note: fix for almonte will be separate due to diff btw the branches..
(cherry picked from commit 3abd5488)