Merge changes from topic "remove_dev_mode"
am: 8027ca9b97

Change-Id: I2a03d3286d8e2884c2ecb18b1b7f9c7ef18f963d