Merge changes from topic 'sinkfn' am: 34df98ee6d
am: 862b7e8523

Change-Id: I859296b62fcd7b43775885f4d2ece3272a9bff11