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

Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4