Merge branch 'jellybean' into 'jellybean-legacy'

Change-Id: I2268368e470a53ae0b04b44e8c489b5aefbc7232