Cherry-pick e37e9d9ae6b8a581569c39ede38fc21827983128

Change-Id: I35a6163854941c0c99511afcc05e6c5378743926