Only 2 hits in 7 days, but this has been around for awhile and doesn't hit often but it's a known issue. Change-Id: Iecf335efbdedd0b041c623dd3aae0d4c790af1ab Related-Bug: #1635643