Bug: 144323917 Test: build systemimage Merged-In: If115c4e1f17c33c97f3c8b669490e344f74d30cd Change-Id: If115c4e1f17c33c97f3c8b669490e344f74d30cd
mentioned in commit de4a2879