Merge changes from topic "nnapisync_1.2" am: 96e08aa749
am: fdf9aed0ec

Change-Id: I9c679ad65e7cfa8de6882e7213e176e3788d12e4