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

Change-Id: I7b8cd7d7329bbaf722e55fb6c0db45cd5fc6568d