Merge changes from topic 'dex' am: f665781c74 am: 8a4afd3dad am: 5949d0dcdc  -s ours
am: 455379b70a  -s ours

Change-Id: I7a512ea55d4c88e71037d7b8c3c3d9205d5f285f