Merge changes from topic "apexdenrollback" am: 85b5c1ae72

Change-Id: I3e37e8675c557eeeb29d85821c5a0e4d9321c2f3