Merge "Notice file embededd in APEX is deterministic" am: 9980c6e111

Change-Id: I25651a62edfcfc111af3591433e2f525b168158e