Merge \\"Fix misc-macro-parentheses warnings in frameworks/ml.\\" am: 5f58ad9b94
am: 4745c0f6f0

Change-Id: I56a0cdec0e72acc7ea7d9821fea86ed949861162