Merge commit 'dd796e8' into merge_try2

Change-Id: I7237d936e2eea39f5d4401db06aed6cb3a3dc426