Github: #1786 Change-Id: I349fab71953b6eb77fbb1f70b00f37c1e450a562 (cherry picked from commit e961e05c5cc8644398d5bba7eac8527b34759354)
Github: #1786 Change-Id: I349fab71953b6eb77fbb1f70b00f37c1e450a562 (cherry picked from commit e961e05c5cc8644398d5bba7eac8527b34759354)