dc80bc1fd8
Also add corresponding unit test. Change-Id: Ie1141b5034415ccf3039a71dfedc47cfb2ca7a88 Closes-Bug: #1237912