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

Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4