CRs-Fixed: 3745289 Change-Id: I7356ab3582762ad20284740a97c6f9a4cadb90a7
mentioned in commit dd4c7b0b
mentioned in commit 5cbbd8e0