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

Change-Id: I99ce2bed86369c7a9aba430fa47dacd488188686