Merge "Replace button_dismiss with dismiss_button" into rvc-dev am: eb8025e8ae

Change-Id: Icd30fe188fa5e8fa2e10e54c7a8e1a524ae6426b