Test: build pass Bug: 342060192 Flag: NONE bugfix Change-Id: I21a398b9df58de4c9d84e2628e4f56ec80a323ed