Merge changes from topic "remove_dev_mode" am: 8027ca9b97 am: b321ddb2f2

Change-Id: I8fe01cc3b1a669fb4e7516f37471dc8fe5493cde