Merge "Make license block consistent with the whole package." am: 063e04f971
am: 66c6769847

Change-Id: I2f834982fdb2b0933fe03d867fe9a87b974288e7