Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e
am: 88757661d5

Change-Id: I9567415f53bb86e6d2caebe51060c66e9400cead