am dc8be81a: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1

* commit 'dc8be81ab0656d73e491209ce149594d10b6cb0b':