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

Change-Id: I21f7e9dac6f55e70a30042de210d89792b09fd87