Merge changes from topic "NIAP for AOSP" am: be67537e69

Change-Id: Iad97a12fd29cfe2d36a1642d22bca5f876e6f004