Change-Id: Ib7988c914e3a453cd865d5fba3152b24d9e02d83 Merged-In: Ib7988c914e3a453cd865d5fba3152b24d9e02d83 Fix: 126370499 Test: mma (cherry picked from commit 4f88faf4)