Resubmitted change Idf6b8399 due to a failed merge

Change-Id: Ie075fc620ae16287d77975c11d76740b0fe23cdb