Merge changes from topic "sp04"
am: 432f29f770

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830