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

* commit 'c180eaccf0ff0fb001158d29d94ac60707719e67':