Merge changes from topic "sp04" am: 432f29f770 am: 6c497ec544

Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d