[automerger skipped] Merge "Rename ANS to ONS" am: c78240df19 am: ac483b306d
am: a951bbe072 -s ours
am skip reason: change_id Ifbbc5eccd35c4b0c2c4e60a04425f4aea0fdeafd with SHA1 fd617463b4 is in history

Change-Id: I222f3359603302bd3fae3deb5817ebc2dcae168c