Cherry-picking e37e9d9ae6b8a581569c39ede38fc21827983128

Change-Id: I976f1f55fe0cf6587de2a8589e17f4ffd0acecb1