Mainly as preparation for future patches touching that issue. Change-Id: I80fd885cbf670e0e3252e38b85703c9d052b3056