temporarily include deprecated thing

Change-Id: Ib81a9ab61ab73768fee58222ead15ae9db40e607
warnings

Change-Id: I94d127a4d312890e7eebe1a890206f3fa39e5fc8
move all normalization into the normalize function

Change-Id: I7c3837d32e9e9689e884cff4fb18c0b8bbecffb3
Merge remote-tracking branch 'origin/master' into HEAD

* temporarily include deprecated thing
* warnings
* move all normalization into the normalize function

Change-Id: Ia56b595b3c9381d540c4615d0e2776d6371eca07