Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1

Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d