Change-Id: Ib5acffb1e2c94bae56aed89fbb71a7a15a660485 (cherry picked from commit f736b576bb809e15f9d90ea49f343c43f2fc7367)