backports-3.10.4-1

Change-Id: I46431d146fef0897e0bb2fd362e4a5857981f2be