Port upstream Bugzilla 4.4.4 changes to our modifications

Bug: 64226
Change-Id: I7b1d9e735461b234d0ff9c12209d18416cc7f8c9