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

Change-Id: I02924d30243584b1839511b64703a5171c870234