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

Change-Id: Id53736a0e002f05bdf654cf6478aaab40087a791