Merge "NetworkInterface: Clarify change marker." am: b338fcfdd8 am: 07a9d9d08d am: baf22c314f

Change-Id: Ia1654fa728da0ede20b5aa8cc4b6190b15d1358f