This is a cherry-pick of 2 CLs: 21969a2b26945da3fd86aef7c93479e4fb359a65 c7a581cf7691db5c61e6694aa51daaa994004bd9 Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
This is a cherry-pick of 2 CLs: 21969a2b26945da3fd86aef7c93479e4fb359a65 c7a581cf7691db5c61e6694aa51daaa994004bd9 Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae