Merge commit '0461e1cdf99b26140ee5a6e0aef22fbd1f752886' into HEAD

Bug: 133125685
Test: None
Change-Id: Ica61757e675ed5b7318f66784c47aeb8f601b6de