Merge "Fix the back button ripple." into oc-dev
am: a7914f24dd

Change-Id: I35e474ed44380821278009945529474b6251c23b