Somehow it was merged with a conflict. Test: no, thanks Bug: 149254050 Change-Id: I1dbb8a4c04817f39de147927c26c14e461eb564b