[automerger skipped] Merge changes from topic "nnapisync_1.2" am: 96e08aa749 am: fdf9aed0ec
am: c56c4315b2  -s ours

Change-Id: If289f01a3b0a399bd34b145a8d7b21a5c3454cb0