Merge changes from topic "capture-child-layers" into pi-dev
am: 17511b0527

Change-Id: Ib2ae98549c92f13db5c010533ec6e243d72a230c