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

Change-Id: I04d941f9df9b83df53e8f564e4abcd83d61c279a