Merge changes from topic "apexdenrollback" am: 85b5c1ae72 am: 81b469c83f am: 290794176f

Change-Id: I5a8b7f0928a82bb3de840c8f228be6fa2763c5da