Merge "Reassign TLS slot 2 to TLS_SLOT_APP." am: 3ce06c7b0a
am: e74ab5e8a4

Change-Id: I5f368afe9fed727da9b1aec63f959dee38c1651e