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

Change-Id: Ia7896e8eb32700200d541ef6e92c283b6f0b030b