Merge changes from topic 'dex' am: f665781c74
am: 8a4afd3dad

Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c