Merge changes from topics "replace_asymm", "fp16-op-add" am: 5a080f41a9
am: 63fe3b3960

Change-Id: Icb3a6d940d146722f695a26e6e8bded975a7614e