Merged-In: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7 Test: manual Fixes: 37502513 Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7 (cherry picked from commit b413f1b1)