Merge "Add two operations to 1.2 nn hal." am: af32d47028
am: 0468984419

Change-Id: Iea179d8abea05e11a470808b9da3b62f8e72d738